* master-actionbar: (103 commits)
Revert "Context actionbar for the account screen."
Revert "Add context action bar on FolderList activity." - We are not ready for this sort of future yet ;)
re Bernhard's Issue 4543 fix: only set as read if account.isMarkMessageAsReadOnView()
Fixes 4517: Junk special folder not autoconfigured (rfc6154 implementation was incomplete)
Fixed Issue 4543: Msg UnRead after "Download Complete" pressed
fixed download complete message button
Set (un)read toggle title based on current message state.
Rename some one-letter variables.
Fix whitespace; no functional changes.
Move message selection functionality into the MessageAdapter.
When we're at the end of the message list, dim the next or prev button instead of making it vanish
Don't show the menu button twice. (Don't show it even once on Gingerbread devices, all of which had a hardware menu button)
Remove "flag" as a meessage view menu option (duplicates tapping on the star)
Move "move" and "copy" out of a submenu
Show the subject line in the MessageHeader if the ActionBar title was truncated.
Add icons for the dark theme and make them active.
Set abs title to (no subject) if the message has no subject.
Hide the unread message count in the actionbar when doing an explicit search.
Hide subject line in MessageView since it's now displayed in the actionbar.
IntelliJ IDEA: More build config fixes for ABS.
...
We're not ready for this sort of living in the futre yet.
This reverts commit 0f51eb54c114534741eb9ede2a5c8fcbc661f479.
Conflicts:
res/drawable-hdpi/ic_action_settings_light.png
res/drawable-ldpi/ic_action_settings_light.png
res/drawable-mdpi/ic_action_settings_light.png
res/drawable-xhdpi/ic_action_settings_light.png
res/menu/accounts_context.xml
res/values/strings.xml
src/com/fsck/k9/activity/Accounts.java
Now that the subject line is gone, the right side of the header is now the tallest part of the header.
Put date and time on the same line to keep the header compact.