Added MailConfig to gitignore.
Added test cases.
Fixed todos.
Merge branch 'fix_todos' into develop