diff --git a/src/chatdlgbase.ui b/src/chatdlgbase.ui
index 752a2f65..6542b629 100755
--- a/src/chatdlgbase.ui
+++ b/src/chatdlgbase.ui
@@ -5,7 +5,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>360</width>
+    <width>435</width>
     <height>405</height>
    </rect>
   </property>
diff --git a/src/protocol.cpp b/src/protocol.cpp
index eb73bc78..fc2d1a92 100755
--- a/src/protocol.cpp
+++ b/src/protocol.cpp
@@ -415,12 +415,13 @@ bool CProtocol::ParseMessage ( const CVector<uint8_t>& vecbyData,
 
                 // immediately send acknowledge message
                 CreateAndImmSendAcknMess ( iRecID, iRecCounter );
+
+                // save current message ID and counter to find out if message
+                // was resent
+                iOldRecID  = iRecID;
+                iOldRecCnt = iRecCounter;
             }
         }
-
-        // save current message ID and counter to find out if message was resent
-        iOldRecID  = iRecID;
-        iOldRecCnt = iRecCounter;
     }
     else
     {