Merge branch 'ss/mailsplit'