Revert "Merge branch 'br/imap-send-via-libcurl' into pu"

This reverts commit 8dabb1bcc5ab6a6cebe02eff511c9f0c72b72e3f, reversing
changes made to 76a5afed547754ab9bf7e39ce89ff7c1288277a4.