fix on long emails
Merge branch 'capshare' into testing