Always include currently opened message in the message list

This should fix various bugs where moving to the next/previous message
didn't work.