Sarina/feature/fmo/multipart email

Picking up #3374