--- a/mobilemessaging/unieditor/application/src/UniEditorAppUi.cpp	Fri Mar 12 15:42:19 2010 +0200
+++ b/mobilemessaging/unieditor/application/src/UniEditorAppUi.cpp	Mon Mar 15 12:40:06 2010 +0200
@@ -1795,7 +1795,7 @@
             {
             TPointerEvent* event = static_cast<TPointerEvent*>( aArg2 );
             CMsgBaseControl* control = static_cast<CMsgBaseControl*>( aArg1 );
-            
+            TWsEvent* wsEvent = static_cast<TWsEvent*>(aArg2);
             if ( event->iType == TPointerEvent::EButton1Down )
                 {
                 iFocusedControl = control;
@@ -1816,7 +1816,7 @@
                 }
             else if ( (!iTapConsumed) && (event->iType == TPointerEvent::EButton1Up) )
                 {
-                iLongTapDetector->CancelAnimationL();
+                iLongTapDetector->MonitorWsMessage(*wsEvent);
                 iTapConsumed = ETrue;
                 if ( control && 
                      iFocusedControl == control &&
@@ -7851,8 +7851,19 @@
     	               	plugin->SetEncodingSettings(EFalse, doc->AlternativeEncodingType(), doc->CharSetSupport());
                     }                
                 //Call the plugin SMS adaptation API to get PDU Info
-                plugin->GetNumPDUsL( inputBuff, numOfRemainingChars, numOfPDUs, unicodeMode, alternativeEncodingType);
-                
+               TRAPD( err, plugin->GetNumPDUsL( inputBuff, numOfRemainingChars, numOfPDUs, unicodeMode, alternativeEncodingType) );
+               if ( err == KErrOverflow )
+                    {
+                            iSmsBodyLength = buffLength;
+                            delete iPrevBuffer;
+                            iPrevBuffer = editorTxt;
+                            return;                          
+                    }
+                else if ( err != KErrNone )
+                    {
+                	        User::Leave(err);
+                	}
+                	  				     
                 //save current buffer 
                 delete iPrevBuffer;
                 iPrevBuffer = editorTxt;