diff --git a/e107_plugins/pm/pm.php b/e107_plugins/pm/pm.php
index a94a369d0..4b7cb0051 100755
--- a/e107_plugins/pm/pm.php
+++ b/e107_plugins/pm/pm.php
@@ -170,15 +170,15 @@ class pm_extended extends private_message
 			{
 				if(trim($rec['pm_subject']) == '') { $rec['pm_subject'] = '['.LAN_PM_61.']'; }
 				$sc->setVars($rec);	
-				$txt .= $tp->parseTemplate($PM_INBOX_TABLE, true);
+				$txt .= $tp->parseTemplate($PM_INBOX_TABLE, true, $sc);
 			}
 		}
 		else
 		{
-			$txt .= $tp->parseTemplate($PM_INBOX_EMPTY, true);
+			$txt .= $tp->parseTemplate($PM_INBOX_EMPTY, true, $sc);
 		}
 		
-		$txt .= $tp->parseTemplate($PM_INBOX_FOOTER, true);
+		$txt .= $tp->parseTemplate($PM_INBOX_FOOTER, true, $sc);
 		$txt .= "</form>";
 		
 		return $txt;
@@ -205,7 +205,7 @@ class pm_extended extends private_message
 		
 		
 		$txt = "<form method='post' action='".e_SELF."?".e_QUERY."'>";
-		$txt .= $tp->parseTemplate($PM_OUTBOX_HEADER, true);
+		$txt .= $tp->parseTemplate($PM_OUTBOX_HEADER, true, $sc);
 		if($pmlist['total_messages'])
 		{
 			foreach($pmlist['messages'] as $rec)
@@ -213,14 +213,14 @@ class pm_extended extends private_message
 				if(trim($rec['pm_subject']) == '') { $rec['pm_subject'] = '['.LAN_PM_61.']'; }
 			//	setScVar('pm_handler_shortcodes','pmInfo', $rec);
 				$sc->setVars($rec);	
-				$txt .= $tp->parseTemplate($PM_OUTBOX_TABLE, true);
+				$txt .= $tp->parseTemplate($PM_OUTBOX_TABLE, true, $sc);
 			}
 		}
 		else
 		{
-			$txt .= $tp->parseTemplate($PM_OUTBOX_EMPTY, true);
+			$txt .= $tp->parseTemplate($PM_OUTBOX_EMPTY, true, $sc);
 		}
-		$txt .= $tp->parseTemplate($PM_OUTBOX_FOOTER, true);
+		$txt .= $tp->parseTemplate($PM_OUTBOX_FOOTER, true, $sc);
 		$txt .= '</form>';
 		return $txt;
 	}
@@ -259,7 +259,7 @@ class pm_extended extends private_message
 			$this->pm_mark_read($pmid, $pm_info);
 		}
 
-		$txt = e107::getParser()->parseTemplate($PM_SHOW, true);
+		$txt = e107::getParser()->parseTemplate($PM_SHOW, true, $sc);
 		$ns->tablerender(LAN_PM, $txt);
 
 		if (!$comeFrom)
@@ -296,21 +296,21 @@ class pm_extended extends private_message
 		$sc->pmBlocks = $pmBlocks; 
 	
 		$txt = "<form method='post' action='".e_SELF."?".e_QUERY."'>";
-		$txt .= $tp->parseTemplate($PM_BLOCKED_HEADER, true);
+		$txt .= $tp->parseTemplate($PM_BLOCKED_HEADER, true, $sc);
 		if($pmTotalBlocked = count($pmBlocks))
 		{
 			foreach($pmBlocks as $pmBlocked)
 			{
 				$sc->pmBlocked = $pmBlocked; 
 			//	setScVar('pm_handler_shortcodes','pmBlocked', $pmBlocked);
-				$txt .= $tp->parseTemplate($PM_BLOCKED_TABLE, true);
+				$txt .= $tp->parseTemplate($PM_BLOCKED_TABLE, true, $sc);
 			}
 		}
 		else
 		{
-			$txt .= $tp->parseTemplate($PM_BLOCKED_EMPTY, true);
+			$txt .= $tp->parseTemplate($PM_BLOCKED_EMPTY, true, $sc);
 		}
-		$txt .= $tp->parseTemplate($PM_BLOCKED_FOOTER, true);
+		$txt .= $tp->parseTemplate($PM_BLOCKED_FOOTER, true, $sc);
 		$txt .= '</form>';
 		return $txt;
 	}
diff --git a/e107_plugins/pm/pm_shortcodes.php b/e107_plugins/pm/pm_shortcodes.php
index 902612e59..8f855cff0 100755
--- a/e107_plugins/pm/pm_shortcodes.php
+++ b/e107_plugins/pm/pm_shortcodes.php
@@ -328,18 +328,19 @@ class pm_shortcodes extends e_shortcode
 	public function sc_pm_from_to()
 	{
 		$tp = e107::getParser();
+		$sc = e107::getScBatch('pm',TRUE);
 		
 		if($this->var['pm_from'] == USERID)
 		{
 			$ret = LAN_PM_2.': <br />';
 			$this->var['user_name'] = $this->var['sent_name'];
-			$ret .= $tp->parseTemplate("{PM_TO=link}");
+			$ret .= $tp->parseTemplate("{PM_TO=link}", false, $sc);
 		}
 		else
 		{
 			$ret = LAN_PM_31.': <br />';
 			$this->var['user_name'] = $this->var['from_name'];
-			$ret .= $tp->parseTemplate("{PM_FROM=link}");
+			$ret .= $tp->parseTemplate("{PM_FROM=link}", false, $sc);
 		}
 		return $ret;
 	}
diff --git a/e107_plugins/pm/private_msg_menu.php b/e107_plugins/pm/private_msg_menu.php
index 262c84154..dc629a55f 100755
--- a/e107_plugins/pm/private_msg_menu.php
+++ b/e107_plugins/pm/private_msg_menu.php
@@ -113,7 +113,7 @@ if(check_class($pm_prefs['pm_class']))
 	
 	$pm_inbox = $pmManager->pm_getInfo('inbox');
 
-	$txt = "\n".$tp->parseTemplate($pm_menu_template, TRUE);
+	$txt = "\n".$tp->parseTemplate($pm_menu_template, TRUE, $sc);
 	
 	if($pm_inbox['inbox']['new'] > 0 && $pm_prefs['popup'] && strpos(e_SELF, 'pm.php') === FALSE && $_COOKIE['pm-alert'] != 'ON')
 	{