Merge branch 'da/imap-send-use-credential-helper'