Combine settings for navigation action after removing a message

After the user deletes or moves a message in the message view screen, the available navigation options are:
- Return to message list
- Show previous message
- Show next message

We get rid of the "magic" mode that tries to keep going in the direction in which the user was moving previously.

(cherry picked from commit a75c7abb)