fix smtp session with the filter code path
Merge branch 'master' into portable