fixed a component to get mails from gmail
resolving binary file conflicts