diff --git a/src/com/fsck/k9/activity/Accounts.java b/src/com/fsck/k9/activity/Accounts.java
index f8a92ea0f..c6e092fa0 100644
--- a/src/com/fsck/k9/activity/Accounts.java
+++ b/src/com/fsck/k9/activity/Accounts.java
@@ -367,7 +367,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener {
 
         // see if we should show the welcome message
         if (intent.getBooleanExtra(EXTRA_IMPORTFIRST, false)) {
-        	onImport();
+            onImport();
         } else if (accounts.length < 1) {
             WelcomeMessage.showWelcomeMessage(this);
             finish();
diff --git a/src/com/fsck/k9/activity/setup/WelcomeMessage.java b/src/com/fsck/k9/activity/setup/WelcomeMessage.java
index 437f2b37d..eb4d4413f 100644
--- a/src/com/fsck/k9/activity/setup/WelcomeMessage.java
+++ b/src/com/fsck/k9/activity/setup/WelcomeMessage.java
@@ -40,14 +40,17 @@ public class WelcomeMessage extends K9Activity implements OnClickListener{
     @Override
     public void onClick(View view) {
         switch (view.getId()) {
-        case R.id.next:
-            AccountSetupBasics.actionNewAccount(this);
-            finish();
-            break;
-        case R.id.import_settings:
-            startActivity(new Intent(getApplicationContext(), Accounts.class)
-            	.putExtra(Accounts.EXTRA_IMPORTFIRST, true));
-            finish();
+            case R.id.next: {
+                AccountSetupBasics.actionNewAccount(this);
+                finish();
+                break;
+            }
+            case R.id.import_settings: {
+                startActivity(new Intent(getApplicationContext(), Accounts.class)
+                    .putExtra(Accounts.EXTRA_IMPORTFIRST, true));
+                finish();
+                break;
+            }
         }
     }
 }
diff --git a/src/com/fsck/k9/preferences/SettingsImporter.java b/src/com/fsck/k9/preferences/SettingsImporter.java
index 5b277aa51..a3a26d65e 100644
--- a/src/com/fsck/k9/preferences/SettingsImporter.java
+++ b/src/com/fsck/k9/preferences/SettingsImporter.java
@@ -596,8 +596,10 @@ public class SettingsImporter {
 
     private static boolean isAccountNameUsed(String name, Account[] accounts) {
         for (Account account : accounts) {
-        	if (account == null)
-        		continue;
+            if (account == null) {
+                continue;
+            }
+
             if (account.getDescription().equals(name)) {
                 return true;
             }