Improve charset handling for email
Merge remote-tracking branch 'chiiph/bug/better_charset_handling' into develop
Return smtp's Port to be able to stop listening to it
Merge remote-tracking branch 'chiiph/feature/return_smtp_port' into develop
Fold in changes
Merge branch 'release-0.3.4'