diff --git a/e107_core/templates/page_template.php b/e107_core/templates/page_template.php
index 15a869732..2331fd188 100644
--- a/e107_core/templates/page_template.php
+++ b/e107_core/templates/page_template.php
@@ -94,8 +94,8 @@ $PAGE_TEMPLATE['default']['end'] = '{CPAGERELATED: types=page,news}</div>';
 // define different tablerender mode here
 $PAGE_TEMPLATE['default']['tableRender'] = 'cpage';
 
-
-$PAGE_TEMPLATE['default']['related']['start'] = '{SETIMAGE: w=350&h=350&crop=1}<h2 class="caption">{LAN=LAN_RELATED}</h2><div class="row">';
+$PAGE_TEMPLATE['default']['related']['caption'] = '{LAN=RELATED}';
+$PAGE_TEMPLATE['default']['related']['start'] = '{SETIMAGE: w=350&h=350&crop=1}<div class="row">';
 $PAGE_TEMPLATE['default']['related']['item'] = '<div class="col-md-4"><a href="{RELATED_URL}">{RELATED_IMAGE}</a><h3><a href="{RELATED_URL}">{RELATED_TITLE}</a></h3></div>';
 $PAGE_TEMPLATE['default']['related']['end'] = '</div>';
 
diff --git a/e107_handlers/e_render_class.php b/e107_handlers/e_render_class.php
index 4ee1df794..39c568697 100644
--- a/e107_handlers/e_render_class.php
+++ b/e107_handlers/e_render_class.php
@@ -161,6 +161,11 @@
 				$ret[$sc] = isset($val[$var]) ? (string) $val[$var] : null;
 			}
 
+			if($tmp = e107::callMethod('theme_shortcodes', 'sc_caption', varset($val['caption'])))
+			{
+				$ret['{---CAPTION---}'] = $tmp;
+			}
+
 			$bread = e107::breadcrumb();
 			$ret['{---BREADCRUMB---}'] = e107::getForm()->breadcrumb($bread, true);
 
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index 6b6beda75..55284a3eb 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -4600,9 +4600,10 @@ var_dump($select_options);*/
 		
 		if(count($list))
 		{
-			return "<div class='e-related clearfix hidden-print'>".$head.implode("\n",$list).$tp->parseTemplate($TEMPLATE['end']). '</div>';
+			$text = "<div class='e-related clearfix hidden-print'>".$head.implode("\n",$list).$tp->parseTemplate($TEMPLATE['end']). '</div>';
+			$caption = $tp->parseTemplate(varset($TEMPLATE['caption']));
+			return e107::getRender()->tablerender($caption, $text, 'related', true);
 
-		//	return "<div class='e-related clearfix hidden-print'><hr><h4>".defset('LAN_RELATED', 'Related')."</h4><ul class='e-related'>".implode("\n",$list)."</div>"; //XXX Tablerender?
 		}
 		
 	}		
diff --git a/e107_plugins/news/templates/news_template.php b/e107_plugins/news/templates/news_template.php
index b29cacd6e..a725aa9bb 100644
--- a/e107_plugins/news/templates/news_template.php
+++ b/e107_plugins/news/templates/news_template.php
@@ -172,6 +172,7 @@ $NEWS_TEMPLATE['related']['start'] = "<hr><h4>".defset('LAN_RELATED', 'Related')
 $NEWS_TEMPLATE['related']['item'] = "<li><a href='{RELATED_URL}'>{RELATED_TITLE}</a></li>";
 $NEWS_TEMPLATE['related']['end'] = "</ul>";*/
 
-$NEWS_TEMPLATE['related']['start'] = '{SETIMAGE: w=350&h=350&crop=1}<h2 class="caption">You Might Also Like</h2><div class="row">';
-$NEWS_TEMPLATE['related']['item'] = '<div class="col-md-4"><a href="{RELATED_URL}">{RELATED_IMAGE}</a><h3><a href="{RELATED_URL}">{RELATED_TITLE}</a></h3></div>';
-$NEWS_TEMPLATE['related']['end'] = '</div>';
\ No newline at end of file
+$NEWS_TEMPLATE['related']['caption']    = '{LAN=RELATED}';
+$NEWS_TEMPLATE['related']['start']      = '{SETIMAGE: w=350&h=350&crop=1}<div class="row">';
+$NEWS_TEMPLATE['related']['item']       = '<div class="col-md-4"><a href="{RELATED_URL}">{RELATED_IMAGE}</a><h3><a href="{RELATED_URL}">{RELATED_TITLE}</a></h3></div>';
+$NEWS_TEMPLATE['related']['end']        = '</div>';
\ No newline at end of file