diff --git a/e107_plugins/pm/attachments/index.html b/e107_plugins/pm/attachments/index.html
deleted file mode 100644
index e69de29bb..000000000
diff --git a/e107_plugins/pm/pm.php b/e107_plugins/pm/pm.php
index c0a0ba458..6e76a0780 100755
--- a/e107_plugins/pm/pm.php
+++ b/e107_plugins/pm/pm.php
@@ -166,7 +166,7 @@ class pm_extended extends private_message
 		$enc = (check_class($this->pmPrefs['attach_class']) ? "enctype='multipart/form-data'" : '');
 	//	setScVar('pm_handler_shortcodes','pmInfo', $pm_info);
 		
-		$sc = e107::getScBatch('pm',true, true);
+		$sc = e107::getScBatch('pm',true, 'pm');
 		$sc->setVars($pm_info);
 		
 		$PM_SEND_PM = $this->updateTemplate($PM_SEND_PM);
diff --git a/e107_plugins/pm/shortcodes/batch/pm_shortcodes.php b/e107_plugins/pm/pm_shortcodes.php
similarity index 100%
rename from e107_plugins/pm/shortcodes/batch/pm_shortcodes.php
rename to e107_plugins/pm/pm_shortcodes.php
diff --git a/e107_plugins/pm/private_msg_menu.php b/e107_plugins/pm/private_msg_menu.php
index 3a43874ab..87ede51a9 100755
--- a/e107_plugins/pm/private_msg_menu.php
+++ b/e107_plugins/pm/private_msg_menu.php
@@ -90,7 +90,7 @@ require_once(e_PLUGIN.'pm/pm_func.php');
 
 e107::getScParser();
 
-require_once(e_PLUGIN.'pm/shortcodes/batch/pm_shortcodes.php');
+require_once(e_PLUGIN.'pm/pm_shortcodes.php');
 
 //setScVar('pm_handler_shortcodes','pmPrefs', $pm_prefs);
 $pmManager = new pmbox_manager($pm_prefs);