More updates to BuildEmail