--- a/mailnews/addrbook/src/nsAbWinHelper.cpp
+++ b/mailnews/addrbook/src/nsAbWinHelper.cpp
@@ -30,17 +30,17 @@ struct nsMapiInterfaceWrapper {
   ~nsMapiInterfaceWrapper(void) {
     if (mInterface != NULL) {
       mInterface->Release();
     }
   }
   operator LPUNKNOWN*(void) {
     return reinterpret_cast<LPUNKNOWN*>(&mInterface);
   }
-  tInterface operator->(void)const { return mInterface; }
+  tInterface operator->(void) const { return mInterface; }
   operator tInterface*(void) { return &mInterface; }
 };
 
 static void assignEntryID(LPENTRYID& aTarget, LPENTRYID aSource,
                           ULONG aByteCount) {
   if (aTarget != NULL) {
     delete[](reinterpret_cast<LPBYTE>(aTarget));
     aTarget = NULL;

--- a/mailnews/mime/cthandlers/pgpmime/nsPgpMimeProxy.cpp
+++ b/mailnews/mime/cthandlers/pgpmime/nsPgpMimeProxy.cpp
@@ -87,18 +87,17 @@ static void PgpMimeGetNeedsAddonString(n
   nsresult rv = stringBundleService->CreateBundle(PGPMIME_PROPERTIES_URL,
                                                   getter_AddRefs(stringBundle));
   if (NS_FAILED(rv)) return;
 
   nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv));
   if (NS_FAILED(rv)) return;
 
   nsString result;
-  rv = stringBundle->GetStringFromName(PGPMIME_STR_NOT_SUPPORTED_ID,
-                                       result);
+  rv = stringBundle->GetStringFromName(PGPMIME_STR_NOT_SUPPORTED_ID, result);
   if (NS_FAILED(rv)) return;
   aResult = NS_ConvertUTF16toUTF8(result);
 }
 
 static int MimeEncryptedPgpClassInitialize(MimeEncryptedPgpClass *clazz) {
   mozilla::DebugOnly<MimeObjectClass *> oclass = (MimeObjectClass *)clazz;
   NS_ASSERTION(!oclass->class_initialized, "oclass is not initialized");
 

--- a/mailnews/mime/src/modlmime.h
+++ b/mailnews/mime/src/modlmime.h
@@ -32,17 +32,16 @@ typedef struct MimeHeaders {
 
   bool done_p; /* Whether we've read the end-of-headers marker
                  (the terminating blank line.) */
 
   char **heads;       /* An array of length n_headers which points
                         to the beginning of each distinct header:
                         just after the newline which terminated
                         the previous one.  This is to speed search.
-
                         This is not initialized until all the
                         headers have been read.
                       */
   int32_t heads_size; /* The length (and consequently, how many
                          distinct headers are in here.) */
 
   char *obuffer; /* This buffer is used for output. */
   int32_t obuffer_size;