Add mail server flag.
Merge branch 'mail_server_flag'

Fixes #8.