Fixed message route requirement
Fix email parsing