Email fluent API regression (fixes #2581)