Merge "Fix parser EodExceptions" into ub-mail-master