diff --git a/e107_plugins/forum/templates/forum_icons_template.php b/e107_plugins/forum/templates/forum_icons_template.php
index bc3738dd3..1ae9432f0 100644
--- a/e107_plugins/forum/templates/forum_icons_template.php
+++ b/e107_plugins/forum/templates/forum_icons_template.php
@@ -8,10 +8,8 @@
  *
  * Forum icons template - default
  *
- * $Source: /cvs_backup/e107_0.8/e107_plugins/forum/templates/forum_icons_template.php,v $
- * $Revision$
- * $Date$
- * $Author$
+ * $URL$
+ * $Id$
  */
 
 if ( ! defined('e107_INIT')) { exit(); }
diff --git a/e107_plugins/forum/templates/forum_post_template.php b/e107_plugins/forum/templates/forum_post_template.php
index 0575a5a8d..98e825599 100644
--- a/e107_plugins/forum/templates/forum_post_template.php
+++ b/e107_plugins/forum/templates/forum_post_template.php
@@ -7,11 +7,8 @@
  * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
  *
  *
- *
- * $Source: /cvs_backup/e107_0.8/e107_plugins/forum/templates/forum_post_template.php,v $
- * $Revision$
- * $Date$
- * $Author$
+ * $URL$
+ * $Id$
  */
 
 if (!defined('e107_INIT')) { exit; }
diff --git a/e107_plugins/forum/templates/forum_posted_template.php b/e107_plugins/forum/templates/forum_posted_template.php
index d89b75eb8..8a39c0b15 100644
--- a/e107_plugins/forum/templates/forum_posted_template.php
+++ b/e107_plugins/forum/templates/forum_posted_template.php
@@ -7,11 +7,8 @@
  * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
  *
  *
- *
- * $Source: /cvs_backup/e107_0.8/e107_plugins/forum/templates/forum_posted_template.php,v $
- * $Revision$
- * $Date$
- * $Author$
+ * $URL$
+ * $Id$
  */
 
 if (!defined('e107_INIT')) { exit; }
diff --git a/e107_plugins/forum/templates/forum_preview_template.php b/e107_plugins/forum/templates/forum_preview_template.php
index 443f1879a..0c292bfa3 100644
--- a/e107_plugins/forum/templates/forum_preview_template.php
+++ b/e107_plugins/forum/templates/forum_preview_template.php
@@ -7,11 +7,8 @@
  * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
  *
  *
- *
- * $Source: /cvs_backup/e107_0.8/e107_plugins/forum/templates/forum_preview_template.php,v $
- * $Revision$
- * $Date$
- * $Author$
+ * $URL$
+ * $Id$
  */
 
 if (!defined('e107_INIT')) { exit; }
diff --git a/e107_plugins/forum/templates/forum_template.php b/e107_plugins/forum/templates/forum_template.php
index 64642b226..5431cac59 100644
--- a/e107_plugins/forum/templates/forum_template.php
+++ b/e107_plugins/forum/templates/forum_template.php
@@ -7,11 +7,8 @@
  * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
  *
  *
- *
- * $Source: /cvs_backup/e107_0.8/e107_plugins/forum/templates/forum_template.php,v $
- * $Revision$
- * $Date$
- * $Author$
+ * $URL$
+ * $Id$
  */
 
 if (!defined('e107_INIT')) { exit; }
diff --git a/e107_plugins/forum/templates/forum_viewforum_template.php b/e107_plugins/forum/templates/forum_viewforum_template.php
index 3f1378f22..9de03cba8 100644
--- a/e107_plugins/forum/templates/forum_viewforum_template.php
+++ b/e107_plugins/forum/templates/forum_viewforum_template.php
@@ -7,7 +7,6 @@
  * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
  *
  *
- *
  * $URL$
  * $Id$
  */
@@ -43,7 +42,8 @@ $FORUM_VIEW_START = "
 	</td>
 	</tr>
 	</table>
-
+	<div class='spacer'>
+	{MESSAGE}
 	<div class='spacer'>
 	<table style='".USER_WIDTH."' class='fborder'>
 	<tr>
diff --git a/e107_plugins/forum/templates/forum_viewtopic_template.php b/e107_plugins/forum/templates/forum_viewtopic_template.php
index 577f020c4..b9a4f10ac 100644
--- a/e107_plugins/forum/templates/forum_viewtopic_template.php
+++ b/e107_plugins/forum/templates/forum_viewtopic_template.php
@@ -7,7 +7,6 @@
  * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
  *
  *
- *
  * $URL$
  * $Id$
  */
@@ -57,7 +56,9 @@ $FORUMSTART = "<a id='top'></a><div style='text-align:center'>
 	</tr>
 	</table>
 	</div>
-
+	<div class='spacer'>
+	{MESSAGE}
+	<div class='spacer'>
 	<table style='".USER_WIDTH."'>
 	<tr>
 	<td style='width:60%; text-align: left'>