fixed bugs in email, messages etc