ashley willis d9ecd6170b Merge branch 'master' into issue-162-new ... Conflicts: res/menu/folder_list_option.xml res/menu/message_list_context.xml res/menu/message_list_option.xml res/menu/message_view_option.xml src/com/fsck/k9/Account.java src/com/fsck/k9/activity/ChooseFolder.java src/com/fsck/k9/activity/FolderList.java src/com/fsck/k9/activity/MessageList.java src/com/fsck/k9/activity/MessageView.java src/com/fsck/k9/activity/setup/AccountSettings.java src/com/fsck/k9/activity/setup/FolderSettings.java src/com/fsck/k9/controller/MessagingController.java src/com/fsck/k9/preferences/AccountSettings.java FUCK YEAH. though this code needs some serious review, please. also, it will usually FC when opening a message, but if one is open then next/prev will work just fine.		2012-09-11 08:28:56 -05:00
..
strings.xml	Merge branch 'master' into issue-162-new	2012-09-11 08:28:56 -05:00