Now logging inline email messages properly.
Merged with ui upstream