fix mail parsing.
merge?
merge?
merge?