Merge branch 'incoming-email-config' into 'master'

Make Reply by email easier to configure

Builds on !1566.

Omnibus companion MR: omnibus-gitlab!510 (cc @marin)

See merge request !1580