Fix unsubscription when renaming an IMAP folder

Fixes #2630

NEWS

@@ -7,6 +7,7 @@ Enhancements
 Bug fixes
  - fixed an issue with ActiveSync when the number of messages in the mailbox was greater than the window-size specified by the client
  - fixed sogo-tool operations on Sieve script (#2617)
+ - fixed unsubscription when renaming an IMAP folder (#2630)
 
 2.2.0 (2014-02-24)
 ------------------

SoObjects/Mailer/SOGoMailFolder.m

@@ -299,13 +299,13 @@ static NSString *defaultUserID =  @"anyone";
                                     toURL: destURL];
           if (!error)
             {
-              ASSIGN (imap4URL, nil);
-              ASSIGN (nameInContainer,
-                      ([NSString stringWithFormat: @"folder%@", [newName asCSSIdentifier]]));
-
               // We unsubscribe to the old one, and subscribe back to the new one
               [client subscribe: [destURL path]];
               [client unsubscribe: [imap4URL path]];
+
+              ASSIGN (imap4URL, nil);
+              ASSIGN (nameInContainer,
+                      ([NSString stringWithFormat: @"folder%@", [newName asCSSIdentifier]]));
             }
         }
       else