Merge change I18fdf62f into eclair

* changes:
  Fix mail sending for new message (#2158054)