Updates for editing Messages and more dynamic template names for inline content editing