diff --git a/e107_admin/boot.php b/e107_admin/boot.php
index 54bb12278..38aeef816 100644
--- a/e107_admin/boot.php
+++ b/e107_admin/boot.php
@@ -304,8 +304,7 @@ function e_admin_menu($title, $active_page, $e107_vars, $tmpl = array(), $sub_li
 		{
 			$temp = $tmpl['button_logout'.$kpost];	
 		}
-
-
+		
 		$replace[0] = str_replace(" ", " ", $e107_vars[$act]['text']);
 		// valid URLs
 		$replace[1] = str_replace(array('&', '&'), array('&', '&'), varsettrue($e107_vars[$act]['link'], "#{$act}"));
@@ -317,10 +316,6 @@ function e_admin_menu($title, $active_page, $e107_vars, $tmpl = array(), $sub_li
 		}
 		$replace[3] = $title;
 		$replace[4] = '';
-
-	
-		
-		
 		
 		$replace[5] = $id ? " id='eplug-nav-{$rid}'" : '';
 		$replace[6] = $rid;
diff --git a/e107_core/shortcodes/batch/admin_shortcodes.php b/e107_core/shortcodes/batch/admin_shortcodes.php
index 4e9e16c3c..91afde357 100644
--- a/e107_core/shortcodes/batch/admin_shortcodes.php
+++ b/e107_core/shortcodes/batch/admin_shortcodes.php
@@ -545,6 +545,33 @@ class admin_shortcodes
 		return $ret;
 	}
 
+
+	function sc_admin_pm($parm)
+	{
+		$text = '	<li class="dropdown">
+		<a class="dropdown-toggle" title="Messages" role="button" data-toggle="dropdown" href="#" >
+		<i class="icon-envelope icon-white" class="active"></i> 3
+		<b class="caret"></b>
+		</a> 
+		<div id="dropdown" class="dropdown-menu pull-right e-noclick" style="padding:10px;width:300px">
+		    <ul class="nav-list">
+	    <li class="nav-header">Unread Messages</li>
+	    <li><a href="#">Incoming Message Number 1</a></li>
+	      <li><a href="#">Incoming Message Number 2</a></li>
+	        <li><a href="#">Incoming Message Number 3</a></li>
+	         <li class="divider"></li>
+	    </ul>
+		<textarea class="e-tip input-block-level" title="Example Only"></textarea>
+		<button class="dropdown-toggle btn btn-primary" >Send</button>	
+		</div>
+		</li>';
+		
+		return $text;	
+	}
+
+
+
+
 	function sc_admin_msg($parm)
 	{
 		if (ADMIN)
@@ -1233,7 +1260,7 @@ class admin_shortcodes
 		require(e_ADMIN.'ad_links.php'); //FIXME loaded in boot.php but $admin_cat is not available here. 
 		require_once(e_HANDLER.'admin_handler.php');
 		
-		if($parm == 'home' || $parm == 'logout' || $parm == 'language')
+		if($parm == 'home' || $parm == 'logout' || $parm == 'language' || $parm == 'pm')
 		{
 			$menu_vars = $this->getOtherNav($parm);	
 			return e_admin_menu('', '', $menu_vars, $$tmpl, FALSE, FALSE);
@@ -1433,6 +1460,7 @@ class admin_shortcodes
 	function getOtherNav($type)
 	{
 		$tp = e107::getParser();
+		$frm = e107::getForm();
 		
 		if($type == 'home')
 		{
@@ -1544,6 +1572,7 @@ class admin_shortcodes
 			$menu_vars['language']['sub'] = $tmp;		
 			
 		}	
+
 		
 		return $menu_vars;
 	}
diff --git a/e107_themes/bootstrap/admin_template.php b/e107_themes/bootstrap/admin_template.php
index dbc3af42e..df697e6c9 100644
--- a/e107_themes/bootstrap/admin_template.php
+++ b/e107_themes/bootstrap/admin_template.php
@@ -82,6 +82,7 @@ $E_ADMIN_NAVIGATION['button_language'] = '
 				$label = ADLAN_48.': '.ADMINNAME.' ';
 			}	
 
+
 // Logout / Settings / Personalize 			
 $E_ADMIN_NAVIGATION['button_logout'] = '
 	<li class="dropdown">
@@ -93,6 +94,30 @@ $E_ADMIN_NAVIGATION['button_logout'] = '
 	</li>
 ';
 
+
+// Private Messaging - //TODO Discuss and make this work.. 
+$E_ADMIN_NAVIGATION['button_pm'] = '
+	<li class="dropdown">
+		<a class="dropdown-toggle" title="Messages" role="button" data-toggle="dropdown" href="#" >
+		<i class="icon-envelope icon-white" class="active"></i> 3
+		<b class="caret"></b>
+		</a> 
+		<div id="dropdown" class="dropdown-menu pull-right e-noclick" style="padding:10px;width:300px">
+		    <ul class="nav-list">
+	    <li class="nav-header">Unread Messages</li>
+	    <li><a href="#">Incoming Message Number 1</a></li>
+	      <li><a href="#">Incoming Message Number 2</a></li>
+	        <li><a href="#">Incoming Message Number 3</a></li>
+	         <li class="divider"></li>
+	    </ul>
+		<textarea class="e-tip input-block-level" title="Example Only"></textarea>
+		<button class="dropdown-toggle btn btn-primary" >Send</button>	
+		</div>
+	</li>
+';
+
+
+
 $E_ADMIN_NAVIGATION['button_other'] = '
 	<li>
 		<a  role="button" href="{LINK_URL}" >
@@ -138,10 +163,11 @@ $ADMIN_HEADER = '<div class="navbar navbar-inverse navbar-fixed-top">
           <a class="brand " href="'.e_ADMIN_ABS.'admin.php" title="Return to Front Panel"><img class="admin-logo" src="'.THEME.'images/e107_adminlogo.png" alt="e107" /></a>
           <div class="nav-collapse collapse">
             <div class="dropdown nav pull-right navbar-text ">
-            
+            {ADMIN_PM}
             {ADMIN_NAVIGATION=home}
 			{ADMIN_NAVIGATION=language}
 			{ADMIN_NAVIGATION=logout}
+		
             </div>
             
 			<div class="dropdown nav">
diff --git a/e107_web/js/core/admin.jquery.js b/e107_web/js/core/admin.jquery.js
index ae04facb0..68c83e11d 100644
--- a/e107_web/js/core/admin.jquery.js
+++ b/e107_web/js/core/admin.jquery.js
@@ -41,6 +41,11 @@ $(document).ready(function()
 			});
 		
 		});
+		
+		
+		$('.e-noclick').click(function(e) {
+	    	e.stopPropagation();
+	  	});
 	
 	
 	//	 $(".e-spinner").spinner(); //FIXME breaks tooltips etc.