Merge pull request #1 from MailCore/master

merging latest mail core 2
removed unused variable to removed compilation warning
Merge pull request #649 from marcopifferi/master

Remove unused variable to avoid compilation warning.