Merge remote-tracking branch 'upstream/master'
Merge pull request #487 from pfennema/master

Separate searches for to, cc and bcc fields and uids
Merge remote-tracking branch 'upstream/master'
Unify Project Style
Merge pull request #492 from CodaFi/Style-Fix

Style fix
Merging changes from original project
Merge remote-tracking branch 'upstream/master'