--- a/mailnews/compose/src/nsMsgCopy.cpp
+++ b/mailnews/compose/src/nsMsgCopy.cpp
@@ -382,26 +382,26 @@ nsMsgCopy::CreateIfMissing(nsIMsgFolder 
       NS_ENSURE_SUCCESS(rv, rv);
 
       // if we can't get the path from the folder, then try to create the storage.
       // for imap, it doesn't matter if the .msf file exists - it still might not
       // exist on the server, so we should try to create it
       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;
 }
 ////////////////////////////////////////////////////////////////////////////////////
 // Utility Functions for MsgFolders
 ////////////////////////////////////////////////////////////////////////////////////
 nsresult
 LocateMessageFolder(nsIMsgIdentity   *userIdentity,
                     nsMsgDeliverMode aFolderType,

--- a/mailnews/import/src/nsImportAddressBooks.cpp
+++ b/mailnews/import/src/nsImportAddressBooks.cpp
@@ -410,18 +410,18 @@ void nsImportGenericAddressBooks::GetDef
   rv = impSvc->CreateNewFieldMap(&m_pFieldMap);
   if (NS_FAILED(rv))
     return;
 
   int32_t  sz = 0;
   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);
   }
 }
 
 
 NS_IMETHODIMP nsImportGenericAddressBooks::WantsProgress(bool *_retval)