diff --git a/lib/WebGUI/Asset/Post.pm b/lib/WebGUI/Asset/Post.pm
index 08069e6e9..35fb80e5d 100644
--- a/lib/WebGUI/Asset/Post.pm
+++ b/lib/WebGUI/Asset/Post.pm
@@ -606,8 +606,8 @@ sub notifySubscribers {
                         $lang{$u->profileField("language")}{var} = $self->getTemplateVars($lang{$u->profileField("language")}{var});
 			$lang{$u->profileField("language")}{var}{url} = WebGUI::URL::getSiteURL().$self->getUrl;
                         $lang{$u->profileField("language")}{var}{'notify.subscription.message'} =
-                                         WebGUI::International::get(875,"WebGUI",$u->profileField("language"));
-                        $lang{$u->profileField("language")}{subject} = WebGUI::International::get(523,"WebGUI",$u->profileField("language"));
+                                         WebGUI::International::get(875,"Post",$u->profileField("language"));
+                        $lang{$u->profileField("language")}{subject} = WebGUI::International::get(523,"Post",$u->profileField("language"));
                         $lang{$u->profileField("language")}{message} = $self->processTemplate($lang{$u->profileField("language")}{var}, $self->getThread->getParent->get("notificationTemplateId"));
                 }
                 WebGUI::MessageLog::addEntry($userId,"",$lang{$u->profileField("language")}{subject},$lang{$u->profileField("language")}{message});
diff --git a/lib/WebGUI/Help/Post.pm b/lib/WebGUI/Help/Post.pm
index 14ccc42ec..f950d43ce 100644
--- a/lib/WebGUI/Help/Post.pm
+++ b/lib/WebGUI/Help/Post.pm
@@ -15,6 +15,7 @@ our $HELP = {
 			},
 		]
 	},
+
 	'post template variables' => {
 		title => 'post template variables title',
 		body => 'post template variables body',
@@ -25,6 +26,22 @@ our $HELP = {
 			},
 		]
 	},
+
+	'notification template' => {
+		title => 'notification template title',
+		body => 'notification template body',
+		related => [
+			{
+				tag => 'template language',
+				namespace => 'Template'
+			},
+			{
+				tag => 'post template variables',
+				namespace => 'Post'
+			},
+		]
+	},
+
 };
 
 1;
diff --git a/lib/WebGUI/i18n/English/Post.pm b/lib/WebGUI/i18n/English/Post.pm
index efc940037..e360cf84c 100644
--- a/lib/WebGUI/i18n/English/Post.pm
+++ b/lib/WebGUI/i18n/English/Post.pm
@@ -303,6 +303,41 @@ The name of this attachment.
 		lastUpdated => 1111464988,
 	},
 
+	'notification template title' => {
+		message => q|Notification Template|,
+                lastUpdated => 1111253044,
+        },
+
+	'notification template body' => {
+		message => q|The following variables are available in the Notification Template:
+<p>
+
+All variables from the Post Template Variables.
+<p>
+
+<b>url</b><br>
+The URL to the post that triggered the notification.
+<p>
+
+<b>notification.subscription.message</b><br>
+Internationalized message that a new message has been posted to a thread that the
+user subscribed to.
+<p>
+
+|,
+		lastUpdated => 1111465141,
+	},
+
+        '875' => {
+                message => q|A new message has been posted to one of your subscriptions.|,
+                lastUpdated => 1111470216,
+        },
+
+	'523' => {
+		message => q|Notification|,
+		lastUpdated => 1031514049
+	},
+
 };
 
 1;