Improvements for emails parser