diff --git a/e107_plugins/pm/pm_shortcodes.php b/e107_plugins/pm/pm_shortcodes.php
index 99a32df34..12d8232ce 100755
--- a/e107_plugins/pm/pm_shortcodes.php
+++ b/e107_plugins/pm/pm_shortcodes.php
@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_plugins/pm/pm_shortcodes.php,v $
-|     $Revision: 1.7 $
-|     $Date: 2008-11-25 16:26:02 $
+|     $Revision: 1.8 $
+|     $Date: 2008-11-25 17:38:56 $
 |     $Author: mcfly_e107 $
 +----------------------------------------------------------------------------+
 */
@@ -354,10 +354,8 @@ $pm_outbox = pm_getInfo('outbox');
 if($pm_outbox['outbox']['filled'] < 100)
 {
 	$e107 = e107::getInstance();
-	if($link = $e107->url->getUrl('pm','main','send'))
-	{
-		return "<a href='{$link}'>".PM_SEND_LINK."</a>";
-	}
+	$link = $e107->url->getUrl('pm','main',array('f' => 'send'));
+	return "<a href='{$link}'>".PM_SEND_LINK."</a>";
 }
 return "";
 SC_END
@@ -372,7 +370,7 @@ if($pm_prefs['animate'])
 		return NEWPM_ANIMATION;
 	}
 }
-return "";
+return '';
 SC_END
 
 SC_BEGIN PM_NEXTPREV
diff --git a/e107_plugins/pm/private_msg_menu.php b/e107_plugins/pm/private_msg_menu.php
index cff0376ea..009791a4a 100755
--- a/e107_plugins/pm/private_msg_menu.php
+++ b/e107_plugins/pm/private_msg_menu.php
@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_plugins/pm/private_msg_menu.php,v $
-|     $Revision: 1.5 $
-|     $Date: 2008-11-25 16:26:02 $
+|     $Revision: 1.6 $
+|     $Date: 2008-11-25 17:38:56 $
 |     $Author: mcfly_e107 $
 +----------------------------------------------------------------------------+
 */
@@ -47,14 +47,14 @@ $sc_style['NEWPM_ANIMATE']['post'] = "</a>";
 if(!isset($pm_menu_template))
 {
 	$pm_menu_template = "
-	<a href='{URL=pm|main|box=inbox}'>".PM_INBOX_ICON."</a>
-	<a href='{URL=pm|main|box=inbox}'>".LAN_PM_25."</a>
+	<a href='{URL=pm|main|f=box&box=inbox}'>".PM_INBOX_ICON."</a>
+	<a href='{URL=pm|main|f=box&box=inbox}'>".LAN_PM_25."</a>
 	{NEWPM_ANIMATE}
 	<br />
 	{INBOX_TOTAL} ".LAN_PM_36.", {INBOX_UNREAD} ".LAN_PM_37." {INBOX_FILLED}
 	<br />
-	<a href='{URL=pm|main|box=outbox}'>".PM_OUTBOX_ICON."</a>
-	<a href='{URL=pm|main|box=outbox}'>".LAN_PM_26."</a><br />
+	<a href='{URL=pm|main|f=box&box=outbox}'>".PM_OUTBOX_ICON."</a>
+	<a href='{URL=pm|main|f=box&box=outbox}'>".LAN_PM_26."</a><br />
 	{OUTBOX_TOTAL} ".LAN_PM_36.", {OUTBOX_UNREAD} ".LAN_PM_37." {OUTBOX_FILLED}
 	{SEND_PM_LINK}
 	";
diff --git a/e107_plugins/pm/url/main.php b/e107_plugins/pm/url/main.php
index 5485a908a..298a6c5a2 100755
--- a/e107_plugins/pm/url/main.php
+++ b/e107_plugins/pm/url/main.php
@@ -1,15 +1,15 @@
 <?php
-// $Id: main.php,v 1.2 2008-11-25 16:26:03 mcfly_e107 Exp $
+// $Id: main.php,v 1.3 2008-11-25 17:38:56 mcfly_e107 Exp $
 function url_pm_main($parms)
 {
-	if(isset($parms['box']))
+	switch($parms['f'])
 	{
-		return e_PLUGIN_ABS."pm/pm.php?{$parms['box']}";
-	}
+		case 'box':
+			return e_PLUGIN_ABS."pm/pm.php?{$parms['box']}";
+			break;
 
-	if(isset($parms['send']))
-	{
-		return e_PLUGIN_ABS."pm/pm.php?send";
+		case 'send':
+			return e_PLUGIN_ABS."pm/pm.php?send";
+			break;
 	}
-
 }