Powermail Bugfixes

See #43848 and #48477