Fixed bug when using the mail module across applications.
Fixed bug when using the mail module across applications.

Etenil/assegai,Etenil/assegai,jadatkins/assegai,jadatkins/assegai,lewilewilewi/assegai,lewilewilewi/assegai