@terceiro Please port this PR into your fork: https://github.com/sup-heliotrope/rmail-sup/pull/3. Thanks.