fixed bad merge
 Please enter the commit message for your changes. Lines starting
added setting from_email to procmail/postfix config