Fix multiple small issues with mass messages

This includes multiple small (tiny) fixes on mass messages. The most important one is probably 049d087 which currently breaks sending emails.