diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java index 73f7b0575..a8e7b9b40 100644 --- a/src/com/fsck/k9/activity/MessageList.java +++ b/src/com/fsck/k9/activity/MessageList.java @@ -1007,10 +1007,10 @@ public class MessageList if ((destFolderName != null) && (m != null)) { - final Account account = m.message.getFolder().getAccount(); + final Account account = m.message.getFolder().getAccount(); account.setLastSelectedFolderName(destFolderName); - + switch (requestCode) { case ACTIVITY_CHOOSE_FOLDER_MOVE: @@ -1052,7 +1052,8 @@ public class MessageList { if (mController.isMoveCapable(holder.message.getFolder().getAccount()) == true && folderName != null) { - if (K9.FOLDER_NONE.equalsIgnoreCase(folderName)) { + if (K9.FOLDER_NONE.equalsIgnoreCase(folderName)) + { return; } mAdapter.removeMessage(holder); diff --git a/src/com/fsck/k9/activity/MessageView.java b/src/com/fsck/k9/activity/MessageView.java index eb5df0d6d..44e8f4922 100644 --- a/src/com/fsck/k9/activity/MessageView.java +++ b/src/com/fsck/k9/activity/MessageView.java @@ -1029,7 +1029,8 @@ public class MessageView extends K9Activity implements OnClickListener String srcFolder = mMessageReference.folderName; String dstFolder = mAccount.getArchiveFolderName(); Message messageToMove = mMessage; - if (K9.FOLDER_NONE.equalsIgnoreCase(dstFolder)) { + if (K9.FOLDER_NONE.equalsIgnoreCase(dstFolder)) + { return; } showNextMessage(); @@ -1053,7 +1054,8 @@ public class MessageView extends K9Activity implements OnClickListener String srcFolder = mMessageReference.folderName; String dstFolder = mAccount.getSpamFolderName(); Message messageToMove = mMessage; - if (K9.FOLDER_NONE.equalsIgnoreCase(dstFolder)) { + if (K9.FOLDER_NONE.equalsIgnoreCase(dstFolder)) + { return; } showNextMessage();