diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index 84471c3e4..0db98f55b 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -1,3 +1,7 @@
+6.5.5
+ - Fixed a bug in the collaboration system that caused replies to fail.
+
+
 6.5.4 
  - fix [ 1160953 ] JavaScript Errors in admin console - IE
  - Fixed a drag and drop problem.
@@ -23,6 +27,7 @@
  - fix [ 1169379 ] eventscalendar wobjects have wrong scope after upgrade
  - fix [ 1168812 ] navigation sometimes fails to use correct... [mwilson]
 
+
 6.5.3
  - Sorted templates into folders named after their respective namespaces
    & re-enabled the manage button next to the template dropdown [mwilson]
diff --git a/lib/WebGUI/Asset/Post.pm b/lib/WebGUI/Asset/Post.pm
index b7153b282..997a00380 100644
--- a/lib/WebGUI/Asset/Post.pm
+++ b/lib/WebGUI/Asset/Post.pm
@@ -826,7 +826,7 @@ sub www_deny {
 #-------------------------------------------------------------------
 sub www_edit {
 	my $self = shift;
-	my %var = %{$self->getTemplateVars};
+	my %var;
 	my $content;
 	my $title;
 	if ($session{form}{func} eq "add") { # new post
@@ -988,6 +988,7 @@ sub www_edit {
 		name  => 'endDate',
 		value => $endDate
 		});
+	$self->getThread->getParent->appendTemplateLabels(\%var);
 	return $self->getThread->getParent->processStyle($self->processTemplate(\%var,$self->getThread->getParent->get("postFormTemplateId")));
 }