Fixing merge issues
Merge pull request #124 from neomarbassani/master

Adding functions to Add toolbar button and get content from selected emails