Mailparser fix