--- a/emailuis/emailui/src/FreestyleEmailUiSendAttachmentsListModel.cpp	Fri Feb 19 22:37:30 2010 +0200
+++ b/emailuis/emailui/src/FreestyleEmailUiSendAttachmentsListModel.cpp	Fri Mar 12 15:41:14 2010 +0200
@@ -433,6 +433,8 @@
 
 	// header and dividers
 	CreateListSkeletonL();
+	//moved from CreateListSkeletonL();
+	SetupTitlePaneTextL();
 	// list model items
 	CreateListItemsL();
 
@@ -518,7 +520,6 @@
     
     iAttachmentsList->SetItemsAlwaysExtendedL(ETrue);
     
-    SetupTitlePaneTextL();
 	}
 
 // ---------------------------------------------------------------------------
@@ -716,6 +717,10 @@
 			// compose view is open, so remove attachment there
 			composeView->NewMessage()->RemoveChildPartL(
 				item->MailMsgPartId() );
+			if ( iItems.Count() == 1 )
+				{
+					composeView->NewMessage()->ResetFlag( EFSMsgFlag_Attachments );
+				}
 			}
 		else
 			{
@@ -732,6 +737,7 @@
                 EFSMsgDataStructure );
 			CleanupStack::PushL( msg );
 			msg->RemoveChildPartL( item->MailMsgPartId() );
+			msg->ResetFlag( EFSMsgFlag_Attachments );
 			msg->SaveMessageL();
 			CleanupStack::PopAndDestroy( msg );
 			}
@@ -799,6 +805,7 @@
             RemoveAndDestroy( i );
             }
         }
+    msg->ResetFlag( EFSMsgFlag_Attachments );
     msg->SaveMessageL();
 
     // Delete msg if we own it