Fix for issue 438 - Error: E-Mail Message required!