diff --git a/e107_plugins/pm/pm_shortcodes.php b/e107_plugins/pm/pm_shortcodes.php
index 3bf90272d..f4b7994b7 100755
--- a/e107_plugins/pm/pm_shortcodes.php
+++ b/e107_plugins/pm/pm_shortcodes.php
@@ -578,13 +578,11 @@ class pm_shortcodes extends e_shortcode
 	 */
 	public function url($action, $params = array(), $options = array())
 	{
-		if($action == "new"){ $action = 'send'; }
-		return e_PLUGIN."pm/pm.php?".$action; //FIXME 
 		if(strpos($action, '/') === false) $action = 'view/'.$action;
 		
-		e107::getUrl()->create('pm/'.$action, $params, $options);
+		return e107::getUrl()->create('pm/'.$action, $params, $options);
 	}
 }
 
 
-?>
\ No newline at end of file
+?>