Merge branch 'rs/mailsplit'