Bug 1155952 - Nesting level does not match indentation r=rkent

--HG--
extra : rebase_source : ab14565f9608758866db10e61682f7c25d66eb10

mailnews/compose/src/nsMsgCopy.cpp

@@ -387,16 +387,16 @@ nsMsgCopy::CreateIfMissing(nsIMsgFolder **folder, bool *waitForUrl)
       bool exists = false;
       if (!isAsyncFolder && folderPath)
         folderPath->Exists(&exists);
-        if (!exists)
-        {
-          (*folder)->CreateStorageIfMissing(this);
-          if (isAsyncFolder)
-            *waitForUrl = true;
+      if (!exists)
+      {
+        (*folder)->CreateStorageIfMissing(this);
+        if (isAsyncFolder)
+          *waitForUrl = true;
 
-          rv = NS_OK;
-        }
+        rv = NS_OK;
       }
     }
+  }
   return rv;
 }
 ////////////////////////////////////////////////////////////////////////////////////

mailnews/import/src/nsImportAddressBooks.cpp

@@ -415,8 +415,8 @@ void nsImportGenericAddressBooks::GetDefaultFieldMap(void)
   rv = m_pFieldMap->GetNumMozFields(&sz);
   if (NS_SUCCEEDED(rv))
     rv = m_pFieldMap->DefaultFieldMap(sz);
-    if (NS_SUCCEEDED(rv))
-      rv = m_pInterface->InitFieldMap(m_pFieldMap);
+  if (NS_SUCCEEDED(rv))
+    rv = m_pInterface->InitFieldMap(m_pFieldMap);
   if (NS_FAILED(rv)) {
     IMPORT_LOG0("*** Error: Unable to initialize field map\n");
     NS_IF_RELEASE(m_pFieldMap);