Resolve #3089331 "Return path is set"

Mark Fullmerrequested to merge
issue/mimemail-3089331:3089331-return-path-is-set into 2.0.x

Closes #3089331

Merge request reports