diff --git a/e107_plugins/forum/forum.php b/e107_plugins/forum/forum.php
index 0d031818b..e9b04f5d9 100644
--- a/e107_plugins/forum/forum.php
+++ b/e107_plugins/forum/forum.php
@@ -239,6 +239,10 @@ if (!isset($FORUM_MAIN_START))
 	{
 		include_once(THEME.'forum_template.php');
 	}
+	elseif(file_exists(THEME.'templates/forum/forum_template.php'))
+	{
+		require_once(THEME.'templates/forum/forum_template.php');
+	}
 }
 include(e_PLUGIN.'forum/templates/forum_template.php');
 
diff --git a/e107_plugins/forum/forum_post.php b/e107_plugins/forum/forum_post.php
index ce3a5e733..558879f92 100644
--- a/e107_plugins/forum/forum_post.php
+++ b/e107_plugins/forum/forum_post.php
@@ -362,6 +362,10 @@ class forum_post_handler
 			{
 				include_once(THEME.$file);
 			}
+			elseif(is_readable(THEME.'templates/forum/'.$file))
+			{
+				include_once(THEME.'templates/forum/'.$file);
+			}
 			else
 			{
 				include_once(e_PLUGIN.'forum/templates/'.$file);
@@ -675,6 +679,10 @@ class forum_post_handler
 				{
 					require_once(THEME."forum_preview_template.php");
 				}
+				elseif(file_exists(THEME.'templates/forum/forum_preview_template.php'))
+				{
+					require_once(THEME.'templates/forum/forum_preview_template.php');
+				}
 				else
 				{
 					require_once(e_PLUGIN."forum/templates/forum_preview_template.php");
diff --git a/e107_plugins/forum/forum_viewforum.php b/e107_plugins/forum/forum_viewforum.php
index 8aa6eb83f..35300faa7 100644
--- a/e107_plugins/forum/forum_viewforum.php
+++ b/e107_plugins/forum/forum_viewforum.php
@@ -108,7 +108,11 @@ $threadsViewed = $forum->threadGetUserViewed();
 
 if (!vartrue($FORUM_VIEW_START))
 {
-	if (file_exists(THEME.'forum_viewforum_template.php'))
+	if(file_exists(THEME.'templates/forum/forum_viewforum_template.php'))
+	{
+		require_once(THEME.'templates/forum/forum_viewforum_template.php');
+	}
+	elseif (file_exists(THEME.'forum_viewforum_template.php'))
 	{
 		require_once(THEME.'forum_viewforum_template.php');
 	}