--- a/mobilemessaging/unieditor/application/src/UniEditorAppUi.cpp	Mon Mar 15 12:40:06 2010 +0200
+++ b/mobilemessaging/unieditor/application/src/UniEditorAppUi.cpp	Wed Mar 31 21:25:02 2010 +0300
@@ -2846,6 +2846,16 @@
         }
     
     TUniState currentState = Document()->UniState();
+    if(currentState == EUniMms)
+        {
+        TInt PrevSlidecount = iSmilModel->SlideCount();
+        iSmilModel->RemoveEmptySlides();
+        if( PrevSlidecount != iSmilModel->SlideCount() )
+            {
+            Document()->SetBodyModified( ETrue );
+            CheckBodyForMessageTypeL();  
+            }
+        }
     
     TBool modified( EFalse );
     if ( !VerifyAddressesL( modified ) )
@@ -7455,6 +7465,11 @@
         }
         
     CleanupStack::PopAndDestroy( queryText );
+    if(!ObjectsAvailable() && Document()->CurrentSlide())
+        {
+        DoRemoveSlideL();
+        Document()->SetBodyModified( ETrue ); 
+        }   
     CheckBodyForMessageTypeL();
     MsgLengthToNavipaneL();
     }
@@ -7477,8 +7492,12 @@
             Document()->SetBodyModified( ETrue );
             
             UpdateSmilTextAttaL();
-            }
-        
+            }        
+        if((Document()->UniState() == EUniMms) &&(!ObjectsAvailable() && Document()->CurrentSlide()))
+            {
+            DoRemoveSlideL();
+            Document()->SetBodyModified( ETrue ); 
+            }        
         CheckBodyForMessageTypeL();
         MsgLengthToNavipaneL();
         SetOrRemoveMaxSizeInEdwin();