diff --git a/message/edit.php b/message/edit.php
index e8c4f4ace4250..259bb23957082 100644
--- a/message/edit.php
+++ b/message/edit.php
@@ -201,7 +201,7 @@
 $number_procs = count($processors);
 echo '<table cellpadding="2"><tr><td>&nbsp;</td>'."\n";
 foreach ( $processors as $processorid => $processor){
-    echo '<th align="center">'.get_string($processor->name, 'messageprocessor_'.$processor->name).'</th>';
+    echo '<th align="center">'.get_string($processor->name, 'message_'.$processor->name).'</th>';
 }
 echo '</tr>';
 
@@ -247,7 +247,7 @@
         if (class_exists($processclass)) {
             $pclass = new $processclass();
             echo '<fieldset id="messageprocessor_'.$processor->name.'" class="clearfix">';
-            echo '<legend class="ftoggler">'.get_string($processor->name, 'messageprocessor_'.$processor->name).'</legend>';
+            echo '<legend class="ftoggler">'.get_string($processor->name, 'message_'.$processor->name).'</legend>';
 
             echo $pclass->config_form($preferences);
 
diff --git a/lang/en_utf8/messageprocessor_email.php b/message/output/email/lang/en_utf8/message_email.php
similarity index 100%
rename from lang/en_utf8/messageprocessor_email.php
rename to message/output/email/lang/en_utf8/message_email.php
diff --git a/lang/en_utf8/messageprocessor_jabber.php b/message/output/jabber/lang/en_utf8/message_jabber.php
similarity index 100%
rename from lang/en_utf8/messageprocessor_jabber.php
rename to message/output/jabber/lang/en_utf8/message_jabber.php
diff --git a/lang/en_utf8/messageprocessor_popup.php b/message/output/popup/lang/en_utf8/message_popup.php
similarity index 100%
rename from lang/en_utf8/messageprocessor_popup.php
rename to message/output/popup/lang/en_utf8/message_popup.php