Mail service transport bugfix