Merge branch 'ejhernandez/client-drafts-no-updated'

NEWS

@@ -2,6 +2,7 @@ master
 ------
 
 Bug fixes
+ - Sent mails are not longer in Drafts folder using Outlook
  - Fix server side crash parsing rtf emails with images (with word97 format)
 
 2.2.15-zentyal2 (2015-03-16)

OpenChange/MAPIStoreMailFolder.m

@@ -1163,13 +1163,20 @@ _parseCOPYUID (NSString *line, NSArray **destUIDsP)
   if (![[result objectForKey: @"result"] boolValue])
     return MAPISTORE_ERROR;
 
-  /* "Move" treatment: Store \Deleted and unregister urls */
+  /* "Move" treatment: Store \Deleted and unregister urls as soft-deleted */
   if (!wantCopy)
     {
       [client storeFlags: [NSArray arrayWithObject: @"Deleted"] forUIDs: uids
              addOrRemove: YES];
       for (count = 0; count < midCount; count++)
-        [mapping unregisterURLWithID: srcMids[count]];
+        {
+          /* Using soft-deleted to make deleted fmids to return the
+             srcMids.
+             See [MAPIStoreFolder getDeletedFMIDs:andCN:fromChangeNumber:inTableType:inMemCtx]
+             for details */
+          [mapping unregisterURLWithID: srcMids[count]
+                              andFlags: MAPISTORE_SOFT_DELETE];
+        }
     }
 
   /* Registration of target messages */