Another big commit but sending replies to emails mostly works.