Getting synced up to HTML email branch