Merge branch 'mh/fix-send-email-threaded'