[#40849497] changes for twitter email scenario