Fix for generate_headers.
Merge branch 'develop' of https://github.com/Hete/kohana-mail into develop