Fixes #78 - When Sending S/MIME From headers is duplicated and Return-Path could also be duplicated