Move more mail settings into the environment file.

Updated PR, since I fubarred the other once. ;)