diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index d144bafdf..1f09adc07 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,4 +1,6 @@
 7.3.18
+ - fix: thread next/prev url (perlDreamer Consulting, LLC)
+    http://www.plainblack.com/bugs/tracker/thread-next/prev-url/
  - fix: getLineage joinClass expects string, not array ref (perlDreamer Consulting, LLC)
     http://www.plainblack.com/bugs/tracker/getlineage-joinclass-expects-string-not-array-ref#wzbxkyWPuzsCRBr3x9QImA
  - fix: "Rejected" messages in CS mail
diff --git a/lib/WebGUI/Asset/Post/Thread.pm b/lib/WebGUI/Asset/Post/Thread.pm
index 8c64d05ac..5b9a04f69 100644
--- a/lib/WebGUI/Asset/Post/Thread.pm
+++ b/lib/WebGUI/Asset/Post/Thread.pm
@@ -900,10 +900,10 @@ sub view {
 	$p->appendTemplateVars($var);
         $var->{'add.url'} = $self->getParent->getNewThreadUrl;
  
-	my $next = $self->getNextThread;
-	my $previous = $self->getPreviousThread;
-        $var->{"previous.url"} = $self->getUrl("func=previousThread") if (defined $previous);
-        $var->{"next.url"} = $self->getUrl("func=nextThread") if (defined $next);
+    my $next     = $self->getNextThread;
+    my $previous = $self->getPreviousThread;
+    $var->{"previous.url"} = $previous->getUrl if (defined $previous);
+    $var->{"next.url"}     = $next->getUrl     if (defined $next);
 
 	$var->{"search.url"} = $self->getParent->getSearchUrl;
         $var->{"collaboration.url"} = $self->getThread->getParent->getUrl;
@@ -951,6 +951,10 @@ sub www_lockThread {
 
 Displays the next logical thread after this one.
 
+NOTE:
+
+This method is deprecated.  It messes with macros via $session->asset.
+
 =cut
 
 sub www_nextThread {
@@ -969,6 +973,10 @@ sub www_nextThread {
 
 Displays the previous logical thread before this one.
 
+NOTE:
+
+This method is deprecated.  It messes with macros via $session->asset.
+
 =cut
 
 sub www_previousThread {