--- a/.gecko_rev.yml
+++ b/.gecko_rev.yml
@@ -1,13 +1,13 @@
 ---
 GECKO_BASE_REPOSITORY: https://hg.mozilla.org/mozilla-unified
 GECKO_HEAD_REPOSITORY: https://hg.mozilla.org/releases/mozilla-esr60
 GECKO_HEAD_REF: THUNDERBIRD_60_VERBRANCH
-GECKO_HEAD_REV: 887a438d43fa73e603704d02ea6756ea4e69eb1d
+GECKO_HEAD_REV: 4f509288cfcabfd5ce6a6f3f6b5e11d239781719
 
 ### For comm-central
 # GECKO_BASE_REPOSITORY: https://hg.mozilla.org/mozilla-unified
 # GECKO_HEAD_REPOSITORY: https://hg.mozilla.org/mozilla-central
 # GECKO_HEAD_REF: default
 #
 ### For branches
 # GECKO_BASE_REPOSITORY: https://hg.mozilla.org/mozilla-unified

--- a/mailnews/base/public/nsIMsgFolder.idl
+++ b/mailnews/base/public/nsIMsgFolder.idl
@@ -155,17 +155,17 @@ interface nsIMsgFolder : nsISupports {
    * Close and backup a folder database prior to reparsing
    *
    * @param  newName  New name of the corresponding message folder.
    *                  Used in rename to set the file name to match the renamed
    *                  folder. Set to empty to use the existing folder name.
    */
   void closeAndBackupFolderDB(in ACString newName);
 
-  void Delete ();
+  void Delete();
 
   void deleteSubFolders(in nsIArray folders, in nsIMsgWindow msgWindow);
   void propagateDelete(in nsIMsgFolder folder, in boolean deleteStorage,
                        in nsIMsgWindow msgWindow);
   void recursiveDelete(in boolean deleteStorage, in nsIMsgWindow msgWindow);
 
   /**
    * Create a subfolder of the current folder with the passed in name.
@@ -433,19 +433,19 @@ interface nsIMsgFolder : nsISupports {
                   in nsIMsgWindow msgWindow, in nsIMsgCopyServiceListener listener );
 
   void copyFileMessage(in nsIFile file, in nsIMsgDBHdr msgToReplace,
                        in boolean isDraft, in unsigned long newMsgFlags,
                        in ACString aKeywords,
                        in nsIMsgWindow msgWindow,
                        in nsIMsgCopyServiceListener listener);
 
-  void acquireSemaphore (in nsISupports semHolder);
-  void releaseSemaphore (in nsISupports semHolder);
-  boolean testSemaphore (in nsISupports semHolder);
+  void acquireSemaphore(in nsISupports semHolder);
+  void releaseSemaphore(in nsISupports semHolder);
+  boolean testSemaphore(in nsISupports semHolder);
   readonly attribute boolean locked;
 
   void getNewMessages(in nsIMsgWindow aWindow, in nsIUrlListener aListener);
 
   /**
    * write out summary data for this folder
    * to the given folder cache (i.e. panacea.dat)
    */
@@ -459,17 +459,17 @@ interface nsIMsgFolder : nsISupports {
   attribute unsigned long biffState;
 
   /**
    * The number of new messages since this folder's last biff.
    *
    * @param deep if true, descends into all subfolders and gets a grand total
    */
 
-   long getNumNewMessages (in boolean deep);
+   long getNumNewMessages(in boolean deep);
 
    void setNumNewMessages(in long numNewMessages);
 
   /**
    * are we running a url as a result of the user clicking get msg?
    */
   attribute boolean gettingNewMessages;