Refinements.
Don't retry continuously if host is untrusted
Fixed for SMTP/Outbox