diff --git a/src/com/fsck/k9/activity/DateFormatter.java b/src/com/fsck/k9/activity/DateFormatter.java
index 8d3ba545e..2d6e534d3 100644
--- a/src/com/fsck/k9/activity/DateFormatter.java
+++ b/src/com/fsck/k9/activity/DateFormatter.java
@@ -87,9 +87,7 @@ public class DateFormatter
         if (sChosenFormat == null)
         {
             Preferences prefs = Preferences.getPreferences(context);
-            String chosenFormat = prefs.getPreferences().getString(PREF_KEY, DEFAULT_FORMAT);
-
-            sChosenFormat = chosenFormat;
+            sChosenFormat = prefs.getPreferences().getString(PREF_KEY, DEFAULT_FORMAT);
         }
         return sChosenFormat;
     }
diff --git a/src/com/fsck/k9/activity/FolderInfoHolder.java b/src/com/fsck/k9/activity/FolderInfoHolder.java
index 649f79ab9..e07cf4b67 100644
--- a/src/com/fsck/k9/activity/FolderInfoHolder.java
+++ b/src/com/fsck/k9/activity/FolderInfoHolder.java
@@ -116,9 +116,7 @@ public class FolderInfoHolder implements Comparable<FolderInfoHolder>
         this.name = folder.getName();
         this.lastChecked = folder.getLastUpdate();
 
-        String mess = truncateStatus(folder.getStatus());
-
-        this.status = mess;
+        this.status = truncateStatus(folder.getStatus());
 
         if (this.name.equalsIgnoreCase(K9.INBOX))
         {
diff --git a/src/com/fsck/k9/activity/MessageCompose.java b/src/com/fsck/k9/activity/MessageCompose.java
index de48e24d3..db599c5c4 100644
--- a/src/com/fsck/k9/activity/MessageCompose.java
+++ b/src/com/fsck/k9/activity/MessageCompose.java
@@ -894,8 +894,8 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
 
     private Address[] getAddresses(MultiAutoCompleteTextView view)
     {
-        Address[] addresses = Address.parseUnencoded(view.getText().toString().trim());
-        return addresses;
+
+        return Address.parseUnencoded(view.getText().toString().trim());
     }
 
     /*
@@ -1713,8 +1713,7 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
 
                 if (message.getMessageId() != null && message.getMessageId().length() > 0)
                 {
-                    String messageId = message.getMessageId();
-                    mInReplyTo = messageId;
+                    mInReplyTo = message.getMessageId();
 
                     if (message.getReferences() != null && message.getReferences().length > 0)
                     {
diff --git a/src/com/fsck/k9/activity/MessageView.java b/src/com/fsck/k9/activity/MessageView.java
index 23996d9f3..128456971 100644
--- a/src/com/fsck/k9/activity/MessageView.java
+++ b/src/com/fsck/k9/activity/MessageView.java
@@ -1417,8 +1417,7 @@ public class MessageView extends K9Activity implements OnClickListener
                 dismissDialog(id);
             }
         });
-        final AlertDialog dialog = builder.create();
-        return dialog;
+        return  builder.create();
     }
 
     private void delete()
@@ -2065,8 +2064,7 @@ public class MessageView extends K9Activity implements OnClickListener
         {
             case R.id.dialog_confirm_delete:
             {
-                final Dialog dialog = createConfirmDeleteDialog(id);
-                return dialog;
+                return createConfirmDeleteDialog(id);
             }
         }
         return super.onCreateDialog(id);