Fixed a bug with mail