Tested and bugfixed the email system for issue #222.