meaning tuning
Reorder buttons in message view mode for direct access to spam
Merge pull request #282 from janekx/master

Change of the word meaning
Fix NPE when clicking on a notification with >= 2 messages on SDK < 16.

Seemingly the intents in the task back stack got confused when the
pending intent was updated in those versions (the Accounts intent was
delivered to MessageList). Avoid that by not updating the current
intent, but dropping the old one.

Fixes issue #4955.
Make notification task back stack consistent to activity flow.

Fixes #4956.
Merge remote-tracking branch 'upstream/master'