Cleaned up email format, fixed issue where empty links where printed