Thanx for isolating the mail text files to a separate directory! And putting them under .../templates is also The Right Thing.
But... shouldn't the directory .../templates/mail instead reside under .../templates/default/mail, so that another template can have its own set of files? For example: .../templates/mytemplate/mail ? :?