diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index b32b5923e..26b9c9cd4 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,5 +1,6 @@
 7.10.4
  - fixed #11920: Defaul DataForm emails missing entries.
+ - fixed #11921: DataForm emails contain 1 table per field
 
 7.10.3
  - fixed #11903: Unnecessary debug in Thingy
diff --git a/docs/templates.txt b/docs/templates.txt
index a08bec1d1..c374449ac 100644
--- a/docs/templates.txt
+++ b/docs/templates.txt
@@ -1,11 +1,17 @@
 This is a running list of template changes made during upgrades.  If you have copied the default
 templates, you will need to apply these changes manually to your copies.
 
+7.10.3
+
+  * DataForm email template - default_email
+    Do HTML escaping on field values.  Move table tags outside of the loops so only one table
+    is generated.
+
 7.10.3
 
   * Carousel Default Template - root/import/carousel/carousel-default
     Add a height parameter to the template.
-    
+
   * survey.css
     Removed relative positioning and offset from top.
 
@@ -16,7 +22,6 @@ templates, you will need to apply these changes manually to your copies.
   * root/import/workflow-activity-templates
     Added a folder to hold the assorted Workflow Activity templates.
 
-
 7.10.2
 
   * The Make Page Printable template has changed (as per bug #11857). The HTML
diff --git a/docs/upgrades/packages-7.10.4/default_email.wgpkg b/docs/upgrades/packages-7.10.4/default_email.wgpkg
index 9255e2ecf..77ec09792 100644
Binary files a/docs/upgrades/packages-7.10.4/default_email.wgpkg and b/docs/upgrades/packages-7.10.4/default_email.wgpkg differ