--- a/messagingfw/msgsrvnstore/server/src/MSVSERV.CPP	Wed Apr 14 16:27:44 2010 +0300
+++ b/messagingfw/msgsrvnstore/server/src/MSVSERV.CPP	Tue Apr 27 17:08:58 2010 +0300
@@ -3567,7 +3567,9 @@
 	// if an operation is already running, queue this one
 	if (opRunning)
 		{
-        aOperation.SetCapability(hasCapability);
+#if (defined SYMBIAN_USER_PROMPT_SERVICE)        
+		aOperation.SetCapability(hasCapability);
+#endif
 		QueueOperationL(aOperation, aSessionId);
 		return;
 		}
@@ -3747,7 +3749,11 @@
 			}
 		}
 	
+#if (defined SYMBIAN_USER_PROMPT_SERVICE)
 	aQueue->At(0)->Start(*aQueue->iMtm, aQueue->At(0)->Capability());
+#else
+	aQueue->At(0)->Start(*aQueue->iMtm, EFalse);
+#endif
 	aQueue->At(0)->SetState(EMsvOperationRunning);
 	}
 

--- a/messagingfw/msgsrvnstore/server/src/msvindexadapter.cpp	Wed Apr 14 16:27:44 2010 +0300
+++ b/messagingfw/msgsrvnstore/server/src/msvindexadapter.cpp	Tue Apr 27 17:08:58 2010 +0300
@@ -1424,10 +1424,7 @@
         User::Leave(err);
         }
     UpdateDates(*oldEntry, EFalse);
-    if(aNewEntryContents.Connected())
-        {
-        oldEntry->Entry().SetConnected(EFalse);
-        }
+    
     if(aForcedUpdate || changedPrivateInfo && aOwnerId != KMsvServerId )
         {
         oldEntry->SetEntryOwnerId(aOwnerId);

--- a/messagingfw/senduiservices/src/SendUiImpl.cpp	Wed Apr 14 16:27:44 2010 +0300
+++ b/messagingfw/senduiservices/src/SendUiImpl.cpp	Tue Apr 27 17:08:58 2010 +0300
@@ -1386,8 +1386,6 @@
     CSendUiFileRightsEngine* fileRightsEngine = CSendUiFileRightsEngine::NewLC( iCoeEnv->FsSession() );
     cleanupItems++;
     // Get attachments
-    if ( aMessageData )
-        {
         attachments = CSendUiAttachment::InitAttachmentArrayLCC( 
             aMessageData->AttachmentArray(), 
             aMessageData->AttachmentHandleArray(),
@@ -1399,8 +1397,7 @@
 		     //there are no attachments, so no point in checking the file rights at all.
 		     CleanupStack::PopAndDestroy( cleanupItems );
 		     return ETrue;    
-		     }
-        }   
+		     }  
     fileRightsEngine->ConfirmDrmFileRightsL( attachments );
     if ( attachments->Count() <= 0 )
         {