Improved email collection from Bitbucket