diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 3c03b8a10..9afcd2936 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -13,6 +13,7 @@
  - fixed #12156: Asset Manager performance
  - fixed #12158: Shop credit cannot be used to pay for Shipping on PayPal
  - rfe #12159: Asset Manager sort preferences
+ - added: new default Collaboration System notification template.
 
 7.10.17
  - fixed: Forced to use a PayDriver even with a balance of 0 in the cart.
diff --git a/docs/templates.txt b/docs/templates.txt
index 8157d8b58..999e7f13d 100644
--- a/docs/templates.txt
+++ b/docs/templates.txt
@@ -1,6 +1,10 @@
 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.18
+  * Collaboration System Default Notification Template /default_forum_notification
+    Replace table with divs to make inline replying easier.
+
 7.10.15
   * Gallery CSS - root/import/gallery-templates/gallery.css
     Remove float:left on .wgAlbum.
diff --git a/docs/upgrades/packages-7.10.18/default_forum_notification.wgpkg b/docs/upgrades/packages-7.10.18/default_forum_notification.wgpkg
new file mode 100644
index 000000000..aebd53790
Binary files /dev/null and b/docs/upgrades/packages-7.10.18/default_forum_notification.wgpkg differ
diff --git a/lib/WebGUI/i18n/English/Asset_Collaboration.pm b/lib/WebGUI/i18n/English/Asset_Collaboration.pm
index 42bccecde..13e40d26d 100644
--- a/lib/WebGUI/i18n/English/Asset_Collaboration.pm
+++ b/lib/WebGUI/i18n/English/Asset_Collaboration.pm
@@ -1809,6 +1809,12 @@ the Collaboration Asset, the user will be notified.|,
         lastUpdated => 0,
     },
 
+    'View this message on the website' => {
+        message     => q{View this message on the website},
+        context     => q{label in the default notification email template},
+        lastUpdated => 0,
+    },
+
 };
 
 1;