--- a/mobilemessaging/unieditor/application/src/UniEditorSendUiOperation.cpp	Wed Sep 01 12:31:54 2010 +0100
+++ b/mobilemessaging/unieditor/application/src/UniEditorSendUiOperation.cpp	Tue Sep 14 21:11:56 2010 +0300
@@ -235,6 +235,9 @@
         if(obj->MediaInfo()->MimeType().CompareF( KMsgMimeImageJpeg )== 0)
             {
             iOptimizedFlow = ETrue;
+            iObserver.EditorOperationEvent( EUniEditorOperationSendUi,
+                                             EUniEditorOperationPartialComplete );   
+            iOptimizedFlow = EFalse;
             }
         }
         
@@ -477,7 +480,6 @@
                 iImageOperation = CUniEditorProcessImageOperation::NewL( *this, iDocument, iFs );
                 }
                 
-            iImageOperation->SetOptimizedFlow(iOptimizedFlow);
             // Processes if needed:
             iImageOperation->Process( static_cast<CMsgImageInfo*>( aObject->MediaInfo() ),
                                       aObject->AttachmentId(),
@@ -581,7 +583,7 @@
 // ---------------------------------------------------------
 //
 void CUniEditorSendUiOperation::HandleOperationEvent( TUniEditorOperationType aOperation,
-                                                      TUniEditorOperationEvent aEvent )
+                                                      TUniEditorOperationEvent /*aEvent*/ )
     {
     TBool remove( EFalse );
     
@@ -590,17 +592,6 @@
     
     if ( aOperation == EUniEditorOperationProcessImage )
         {
-        if( aEvent == EUniEditorOperationPartialComplete)
-            {
-            if(iOptimizedFlow)
-                {           
-                iObserver.EditorOperationEvent( EUniEditorOperationSendUi,
-                                                EUniEditorOperationPartialComplete );
-                iOptimizedFlow = EFalse;                        
-                }
-            return;
-            }
-        iOptimizedFlow = EFalse;
         // Process image error handling
         CArrayFixFlat<TInt>* errors = iImageOperation->GetErrors();
         for ( TInt i = 0; i < errors->Count(); i++ )