Removing unnecessary return.
Merge pull request #484 from yellowandy/patch-1

Removing unnecessary return.
Merge latest changes including search-size from CodaFi and continue from there with size changes
Merge https://github.com/MailCore/mailcore2