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.
We always allow zooming but hide (provided the Android version supports
it) the on-screen zoom controls if the device supports multi-touch,
hence pinch-to-zoom.
added message upload support.
added advanced option to create local-only folder.
disabled sync & push for local-only folders.
hid expunge, check_mail, and "Load up to x more" for local-only folders.
hid create/rename/delete folder options for webdav (someone give me a webdav account).
added advanced option to change if a folder is local-only or syncable.
add dialog to confirm clearing local messages, and if it should include local-only messages or just synced messages.
added advanced option to automatically upload on move from local-only to syncable.
changed background color in message list and subject color in message view of local-only messages.
changed: keep local-only messages in folders no longer on server instead of deleting folder, and mark folder as local-only.
added automatically fully downloading messages moved/copied to local-only folder.
added advanced options option (if not enabled, those settings will be hidden).
reworked onCreateFolder(), onRenameFolder(), onDeleteFolder().
added Store.isAppendCapable().
added LocalFolder.expunge() [unused].
"smaller" (and smaller) fonts by allowing the Accounts and Folder List
items to have a height smaller than the normal Android minimum. This
option is off by default to maintain existing behavior for
uninterested parties. The preferences text is not especially
compelling so could certainly be changed if better phrasing is found.
Added an option whether the registered name color is change or not
Avoid "Connection error" when MessageView is opened. The contacts.getName() might return null.
Allow user to turn off gesture-based control.
Also, consolidate so that gestures could be used by other subclasses
of K9Activity. Probably should be made usable to K9ListActivity, too,
by making MyGestureDetector its own class and make it used by
K9Activity and K9ListActivity, and have the Activities implement a
callback interface for onNext and onPrevious.