From header fix

Changes the mail header filter to filter the from address, fixing the most important part of bug 5834