diff --git a/e107_plugins/pm/templates/pm_menu_template.php b/e107_plugins/pm/templates/pm_menu_template.php
new file mode 100644
index 000000000..0fb507213
--- /dev/null
+++ b/e107_plugins/pm/templates/pm_menu_template.php
@@ -0,0 +1,68 @@
+<?php
+/*
+ * e107 website system
+ *
+ * Copyright (C) 2008-2009 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *	PM plugin - template file
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/pm/pm_template.php,v $
+ * $Revision$
+ * $Date$
+ * $Author$
+ */
+
+
+/**
+ *	e107 Private messenger plugin
+ *
+ *	@package	e107_plugins
+ *	@subpackage	pm
+ *	@version 	$Id$;
+ */
+
+if (!defined('e107_INIT')) { exit; }
+
+define('PM_INBOX_ICON', "<img src='".e_PLUGIN_ABS."pm/images/mail_get.png' class='icon S16' alt='".LAN_PLUGIN_PM_INBOX."' title='".LAN_PLUGIN_PM_INBOX."' />");
+define('PM_OUTBOX_ICON', "<img src='".e_PLUGIN_ABS."pm/images/mail_send.png' class='icon S16' alt='".LAN_PLUGIN_PM_OUTBOX."' title='".LAN_PLUGIN_PM_OUTBOX."' />");
+define('PM_SEND_LINK', LAN_PLUGIN_PM_NEW);
+define('NEWPM_ANIMATION', "<img src='".e_PLUGIN_ABS."pm/images/newpm.gif' alt='' />");
+/*
+$sc_style['PM_SEND_PM_LINK']['pre'] = "<br /><br />";
+$sc_style['PM_SEND_PM_LINK']['post'] = "";
+
+$sc_style['PM_INBOX_FILLED']['pre'] = "[";
+$sc_style['PM_INBOX_FILLED']['post'] = "%]";
+
+$sc_style['PM_OUTBOX_FILLED']['pre'] = "[";
+$sc_style['PM_OUTBOX_FILLED']['post'] = "%]";
+
+$sc_style['PM_NEWPM_ANIMATE']['pre'] = "<a href='".e_PLUGIN_ABS."pm/pm.php?inbox'>";
+$sc_style['PM_NEWPM_ANIMATE']['post'] = "</a>";
+
+$sc_style['PM_BLOCKED_SENDERS_MANAGE']['pre'] = "<br />[ <a href='".e_PLUGIN_ABS."pm/pm.php?blocked'>";
+$sc_style['PM_BLOCKED_SENDERS_MANAGE']['post'] = '</a> ]';
+*/
+$PM_MENU_WRAPPER['PM_SEND_PM_LINK']= "<br /><br />{---}";
+$PM_MENU_WRAPPER['PM_INBOX_FILLED']=$PM_MENU_WRAPPER['PM_OUTBOX_FILLED']= "[{---}%]";
+$PM_MENU_WRAPPER['PM_NEWPM_ANIMATE']= "<a href='".e_PLUGIN_ABS."pm/pm.php?inbox'>{---}</a>";
+$PM_MENU_WRAPPER['PM_BLOCKED_SENDERS_MANAGE']= "<br />[ <a href='".e_PLUGIN_ABS."pm/pm.php?blocked'>{---}</a> ]";
+
+//	$pm_menu_template = "
+	$PM_MENU_TEMPLATE = "
+	<a href='".e_PLUGIN_ABS."pm/pm.php?inbox'>".PM_INBOX_ICON."</a>
+	<a href='".e_PLUGIN_ABS."pm/pm.php?inbox'>".LAN_PLUGIN_PM_INBOX."</a>
+	{PM_NEWPM_ANIMATE}
+	<br />
+	{PM_INBOX_TOTAL} ".LAN_PM_36.", {PM_INBOX_UNREAD} ".LAN_PM_37." {PM_INBOX_FILLED}
+	<br />
+	<a href='".e_PLUGIN_ABS."pm/pm.php?outbox'>".PM_OUTBOX_ICON."</a>
+	<a href='".e_PLUGIN_ABS."pm/pm.php?outbox'>".LAN_PLUGIN_PM_OUTBOX."</a><br />
+	{PM_OUTBOX_TOTAL} ".LAN_PM_36.", {PM_OUTBOX_UNREAD} ".LAN_PM_37." {PM_OUTBOX_FILLED}
+	{PM_SEND_PM_LINK}
+	{PM_BLOCKED_SENDERS_MANAGE}
+	";
+
+
diff --git a/e107_plugins/pm/templates/pm_template.php b/e107_plugins/pm/templates/pm_template.php
index eafd2de6c..1d3b5eb38 100644
--- a/e107_plugins/pm/templates/pm_template.php
+++ b/e107_plugins/pm/templates/pm_template.php
@@ -25,7 +25,7 @@
 
 if (!defined('e107_INIT')) { exit; }
 
-global $sc_style;		// Needed for the PM_REPLY shortcode!
+//global $sc_style;		// Needed for the PM_REPLY shortcode!
 
 if(deftrue('BOOTSTRAP') && deftrue('FONTAWESOME'))
 {
@@ -37,42 +37,7 @@ else
 	if (!defined('PM_READ_ICON')) define('PM_READ_ICON', "<img src='".e_PLUGIN_ABS."pm/images/read.png' class='icon S16' alt='".LAN_PM_111."' />");
 	if (!defined('PM_UNREAD_ICON')) define('PM_UNREAD_ICON', "<img src='".e_PLUGIN_ABS."pm/images/unread.png' class='icon S16' alt='".LAN_PM_27."' />");
 }
-
-define('PM_INBOX_ICON', "<img src='".e_PLUGIN_ABS."pm/images/mail_get.png' class='icon S16' alt='".LAN_PLUGIN_PM_INBOX."' title='".LAN_PLUGIN_PM_INBOX."' />");
-define('PM_OUTBOX_ICON', "<img src='".e_PLUGIN_ABS."pm/images/mail_send.png' class='icon S16' alt='".LAN_PLUGIN_PM_OUTBOX."' title='".LAN_PLUGIN_PM_OUTBOX."' />");
-define('PM_SEND_LINK', LAN_PLUGIN_PM_NEW);
-define('NEWPM_ANIMATION', "<img src='".e_PLUGIN_ABS."pm/images/newpm.gif' alt='' />");
-
-
-$sc_style['PM_SEND_PM_LINK']['pre'] = "<br /><br />";
-$sc_style['PM_SEND_PM_LINK']['post'] = "";
-
-$sc_style['PM_INBOX_FILLED']['pre'] = "[";
-$sc_style['PM_INBOX_FILLED']['post'] = "%]";
-
-$sc_style['PM_OUTBOX_FILLED']['pre'] = "[";
-$sc_style['PM_OUTBOX_FILLED']['post'] = "%]";
-
-$sc_style['PM_NEWPM_ANIMATE']['pre'] = "<a href='".e_PLUGIN_ABS."pm/pm.php?inbox'>";
-$sc_style['PM_NEWPM_ANIMATE']['post'] = "</a>";
-
-$sc_style['PM_BLOCKED_SENDERS_MANAGE']['pre'] = "<br />[ <a href='".e_PLUGIN_ABS."pm/pm.php?blocked'>";
-$sc_style['PM_BLOCKED_SENDERS_MANAGE']['post'] = '</a> ]';
-
-$PM_MENU = "
-<a href='".e_PLUGIN_ABS."pm/pm.php?inbox'>".PM_INBOX_ICON."</a>
-<a href='".e_PLUGIN_ABS."pm/pm.php?inbox'>".LAN_PLUGIN_PM_INBOX."</a>
-{PM_NEWPM_ANIMATE}
-<br />
-{PM_INBOX_TOTAL} ".LAN_PM_36.", {PM_INBOX_UNREAD} ".LAN_PM_37." {PM_INBOX_FILLED}
-<br />
-<a href='".e_PLUGIN_ABS."pm/pm.php?outbox'>".PM_OUTBOX_ICON."</a>
-<a href='".e_PLUGIN_ABS."pm/pm.php?outbox'>".LAN_PLUGIN_PM_OUTBOX."</a><br />
-{PM_OUTBOX_TOTAL} ".LAN_PM_36.", {PM_OUTBOX_UNREAD} ".LAN_PM_37." {PM_OUTBOX_FILLED}
-{PM_SEND_PM_LINK}
-{PM_BLOCKED_SENDERS_MANAGE}
-";
-
+/*
 $sc_style['PM_ATTACHMENT_ICON']['pre'] = " ";
 $sc_style['PM_ATTACHMENTS']['pre'] = "<div class='alert alert-block alert-info'>";
 $sc_style['PM_ATTACHMENTS']['post'] = "</div>";
@@ -108,8 +73,21 @@ $sc_style['PM_REPLY']['pre'] = "<tr>
 $sc_style['PM_REPLY']['post'] = "</td>
 	</tr>
 ";
+*/
 
-$PM_SEND_PM = "<div id='pm-send-pm'>
+$PM_WRAPPER['PM_ATTACHMENT_ICON']= " {---}";
+$PM_WRAPPER['PM_ATTACHMENTS']= "<div class='alert alert-block alert-info'>{---}</div>";
+
+//$sc_style['PM_NEXTPREV']['pre'] = "<tr><td class='forumheader' colspan='6' style='text-align:left'> ".LAN_PM_59;
+//$sc_style['PM_NEXTPREV']['post'] = "</td></tr>";
+
+$PM_WRAPPER['PM_EMOTES']= "<tr><td class='forumheader3'>".LAN_PM_7.": </td><td class='forumheader3'>{---}</td></tr>";
+$PM_WRAPPER['PM_ATTACHMENT']= "<tr><td class='forumheader3'>".LAN_PM_8.": </td><td class='forumheader3'>{---}</td></tr>";
+$PM_WRAPPER['PM_RECEIPT']= "<tr><td class='forumheader3'>".LAN_PM_9.": </td><td class='forumheader3'>{---}</td></tr>";
+$PM_WRAPPER['PM_REPLY']= "<tr><td class='forumheader' style='text-align:center' colspan='2'>{---}</td></tr>";
+
+//$PM_SEND_PM = "<div id='pm-send-pm'>
+$PM_TEMPLATE['send'] = "<div id='pm-send-pm'>
 <table class='table fborder'>
 <thead>
 <tr>
@@ -138,7 +116,8 @@ $PM_SEND_PM = "<div id='pm-send-pm'>
 </div>
 ";
 
-$PM_INBOX_HEADER = "
+//$PM_INBOX_HEADER = "
+$PM_TEMPLATE['inbox']['start'] = "
 <table class='table table-striped fborder'>
 <thead>
 <tr>
@@ -153,7 +132,8 @@ $PM_INBOX_HEADER = "
 	<tbody>
 ";
 
-$PM_INBOX_TABLE = "{SETIMAGE: w=30&h=30&crop=1}
+//$PM_INBOX_TABLE = "{SETIMAGE: w=30&h=30&crop=1}
+$PM_TEMPLATE['inbox']['item'] = "{SETIMAGE: w=30&h=30&crop=1}
 <tr class='{PM_STATUS_CLASS}'>
 	<td class='forumheader3'>{PM_SELECT}</td>
 	<td class='forumheader3'>{PM_ATTACHMENT_ICON}</td>
@@ -165,13 +145,15 @@ $PM_INBOX_TABLE = "{SETIMAGE: w=30&h=30&crop=1}
 </tr>
 ";
 
-$PM_INBOX_EMPTY = "
+//$PM_INBOX_EMPTY = "
+$PM_TEMPLATE['inbox']['empty'] = "
 <tr>
 	<td colspan='6' class='forumheader'>".LAN_PM_34."</td>
 </tr>
 ";
 
-$PM_INBOX_FOOTER = "
+//$PM_INBOX_FOOTER = "
+$PM_TEMPLATE['inbox']['end'] = "
 <tr>
 	<td class='forumheader' colspan='3'>
 	<input type='hidden' name='pm_come_from' value='inbox' />
@@ -185,7 +167,8 @@ $PM_INBOX_FOOTER = "
 </table>
 ";
 
-$PM_OUTBOX_HEADER = "
+//$PM_OUTBOX_HEADER = "
+$PM_TEMPLATE['outbox']['start'] = "
 <table class='table table-striped fborder'>
 <thead>
 <tr>
@@ -200,7 +183,8 @@ $PM_OUTBOX_HEADER = "
 <tbody>
 ";
 
-$PM_OUTBOX_TABLE = "
+//$PM_OUTBOX_TABLE = "
+$PM_TEMPLATE['outbox']['item'] = "
 <tr>
 	<td class='forumheader3'>{PM_SELECT}</td>
 	<td class='forumheader3'>{PM_ATTACHMENT_ICON}</td>
@@ -211,7 +195,8 @@ $PM_OUTBOX_TABLE = "
 </tr>
 ";
 
-$PM_OUTBOX_EMPTY = "
+//$PM_OUTBOX_EMPTY = "
+$PM_TEMPLATE['outbox']['empty'] = "
 <tr>
 	<td colspan='6' class='forumheader'>".LAN_PM_34."</td>
 </tr>
@@ -229,7 +214,8 @@ $PM_OUTBOX_FOOTER = "
 </table>
 ";*/
 
-$PM_OUTBOX_FOOTER = "
+//$PM_OUTBOX_FOOTER = "
+$PM_TEMPLATE['outbox']['end'] = "
 <tr>
 	<td class='forumheader' colspan='3'>
 	<input type='hidden' name='pm_come_from' value='inbox' />
@@ -245,7 +231,7 @@ $PM_OUTBOX_FOOTER = "
 
 
 
-$PM_BLOCKED_HEADER = "
+$PM_TEMPLATE['blocked']['start'] = "
 <table class='table table-striped fborder'>
 <tr>
 	<td class='fcaption' style='width:5%'>&nbsp;</td>
@@ -255,7 +241,7 @@ $PM_BLOCKED_HEADER = "
 </tr>
 ";
 
-$PM_BLOCKED_TABLE = "
+$PM_TEMPLATE['blocked']['item'] = "
 <tr>
 	<td class='forumheader3'>{PM_BLOCKED_SELECT}</td>
 	<td class='forumheader3'>{PM_BLOCKED_USER=link}</td>
@@ -264,13 +250,13 @@ $PM_BLOCKED_TABLE = "
 </tr>
 ";
 
-$PM_BLOCKED_EMPTY = "
+$PM_TEMPLATE['blocked']['empty'] = "
 <tr>
 	<td colspan='4' class='forumheader'>".LAN_PM_67."</td>
 </tr>
 ";
 
-$PM_BLOCKED_FOOTER = "
+$PM_TEMPLATE['blocked']['end'] = "
 <tr>
 	<td class='forumheader' colspan='4' style='text-align:center'>
 	{PM_DELETE_BLOCKED_SELECTED}
@@ -281,7 +267,8 @@ $PM_BLOCKED_FOOTER = "
 
 
 
-$PM_SHOW =
+//$PM_SHOW =
+$PM_TEMPLATE['show'] =
 "<div class='pm-show' style='text-align: center'>
 <table class='table table-bordered table-striped fborder'>
 <tr>
@@ -303,7 +290,8 @@ $PM_SHOW =
 ";
 
 
-$PM_NOTIFY =
+//$PM_NOTIFY =
+$PM_TEMPLATE['notify'] =
 "<div>
 <h4>".LAN_PM_101."{SITENAME}</h4>
 <table class='table table-striped'>