diff --git a/e107_plugins/forum/forum_viewtopic.php b/e107_plugins/forum/forum_viewtopic.php
index d3c0f8e68..d3af3edc9 100644
--- a/e107_plugins/forum/forum_viewtopic.php
+++ b/e107_plugins/forum/forum_viewtopic.php
@@ -473,6 +473,10 @@ $i = $thread->page;
 //---- Moved upwards, to enclose $tVars...
 //---- $sc = e107::getScBatch('view', 'forum');
 
+	$mes = e107::getMessage();
+//		$sc->setVars($thread->threadInfo);
+//--->$forend = $tp->simpleParse($FORUMEND, $tVars);
+$forend = $tp->parseTemplate($FORUMEND, true, $sc);
 
 
 foreach ($postList as $c => $postInfo)
@@ -538,6 +542,7 @@ foreach ($postList as $c => $postInfo)
 }
 unset($loop_uid);
 
+/*---->
 if ($forum->checkPerm($thread->threadInfo['thread_forum_id'], 'post') && $thread->threadInfo['thread_active'])
 {
 	//XXX Show only on the last page??
@@ -578,11 +583,14 @@ if ($forum->checkPerm($thread->threadInfo['thread_forum_id'], 'post') && $thread
 		$tVars->QUICKREPLY = $forum_quickreply;
 	}
 }
+<----*/
 
-
+/*--->
 	$mes = e107::getMessage();
-$forend = $tp->simpleParse($FORUMEND, $tVars);
-
+		$sc->setVars($thread->threadInfo);
+//--->$forend = $tp->simpleParse($FORUMEND, $tVars);
+$forend = $tp->parseTemplate($FORUMEND, true, $sc);
+<---*/
 $forumstring = $forstr . $forthr . vartrue($forrep) . $forend;
 
 //If last post came after USERLV and not yet marked as read, mark the thread id as read
@@ -899,7 +907,7 @@ class e107ForumThread
 		$ns = e107::getRender();
 		$sql = e107::getDb();
 		$tp = e107::getParser();
-		$frm = e107::getForm();
+//Orphan $frm variable????	$frm = e107::getForm();
 
 		if (empty($_GET['f']))
 		{
diff --git a/e107_plugins/forum/shortcodes/batch/view_shortcodes.php b/e107_plugins/forum/shortcodes/batch/view_shortcodes.php
index 63044ee45..1031f8720 100644
--- a/e107_plugins/forum/shortcodes/batch/view_shortcodes.php
+++ b/e107_plugins/forum/shortcodes/batch/view_shortcodes.php
@@ -885,5 +885,51 @@ function sc_message()
 return $thread->message;
 }
 
+	function sc_quickreply()
+	{
+		  global $forum, $forum_quickreply;
+
+if ($forum->checkPerm($this->var['thread_forum_id'], 'post') && $this->var['thread_active'])
+{
+	//XXX Show only on the last page??
+	if (!vartrue($forum_quickreply))
+	{
+		$ajaxInsert = ($thread->pages == $thread->page || $thread->pages == 0) ? 1 : 0;
+	//	$ajaxInsert = 1;
+	//	echo "AJAX-INSERT=".$ajaxInsert ."(".$thread->pages." vs ".$thread->page.")";
+//Orphan $frm variable????		$frm = e107::getForm();
+
+		$urlParms = array('f'=>'rp','id'=>$this->var['thread_id'], 'post'=>$this->var['thread_id']);
+		$url = e107::url('forum','post', null, array('query'=>$urlParms));; // ."?f=rp&amp;id=".$thread->threadInfo['thread_id']."&amp;post=".$thread->threadInfo['thread_id'];
+
+		return "
+		<form action='" . $url . "' method='post'>
+		<div class='form-group'>
+			<textarea cols='80' placeholder='".LAN_FORUM_2007."' rows='4' id='forum-quickreply-text' class='tbox input-xxlarge form-control' name='post' onselect='storeCaret(this);' onclick='storeCaret(this);' onkeyup='storeCaret(this);'></textarea>
+		</div>
+		<div class='center text-center form-group'>
+			<input type='submit' data-token='".e_TOKEN."' data-forum-insert='".$ajaxInsert."' data-forum-post='".$this->var['thread_forum_id']."' data-forum-thread='".$this->var['thread_id']."' data-forum-action='quickreply' name='reply' value='".LAN_FORUM_2006. "' class='btn btn-success button' />
+			<input type='hidden' name='thread_id' value='".$this->var['thread_id']."' />
+		</div>
+		
+		</form>";
+
+		if(E107_DEBUG_LEVEL > 0)
+		{
+		//	echo "<div class='alert alert-info'>Thread id: ".$threadId."</div>";
+		//	print_a($this);
+		}
+
+
+				
+		// Preview should be reserved for the full 'Post reply' page. <input type='submit' name='fpreview' value='" . Preview . "' /> &nbsp;
+	}
+//----	else
+//----	{
+		return $forum_quickreply;
+//----	}
+}
+	}
+
 }
 ?>
\ No newline at end of file