Cleaned up mail formating