Fixed bug for email client.