Qualify transport edits to lines with smtp: prefix
Merge branch 'master' of https://github.com/E-F-A/v3