The option to “close original message window after deleting the message” should be modified to also working when archiving the message. The current behavior is to move to the next message, an undesirable behavior if one is not actually ready to open that next message.