Fixes 213, Fixes 165

Updates ordering of fields in email.