Added br2nl template modifier
Cleanup in Mail.pm