diff --git a/lang/en_utf8/help/forum/message_digests.html b/lang/en_utf8/help/forum/message_digests.html
new file mode 100644
index 00000000000..0af80ef4484
--- /dev/null
+++ b/lang/en_utf8/help/forum/message_digests.html
@@ -0,0 +1,3 @@
+<h1>Forum digests</h1>
+
+<p>Digests are daily collections of posts from forums you have subscribed to.</p>
diff --git a/lang/en_utf8/help/forum/message_posts.html b/lang/en_utf8/help/forum/message_posts.html
new file mode 100644
index 00000000000..8492805925d
--- /dev/null
+++ b/lang/en_utf8/help/forum/message_posts.html
@@ -0,0 +1,3 @@
+<h1>Forum posts</h1>
+
+<p>These are ordinary single posts from forums you have subscribed to.</p>
diff --git a/lang/en_utf8/help/message/message_instantmessage.html b/lang/en_utf8/help/message/message_instantmessage.html
new file mode 100644
index 00000000000..7effd57055e
--- /dev/null
+++ b/lang/en_utf8/help/message/message_instantmessage.html
@@ -0,0 +1,5 @@
+<h1>Messages from other users</h1>
+
+<p>This section configures what happens to messages that are sent to you directly from other users on this site.</p>
+
+<p>You can have configure things to happen differently when you are online or offline.</p>
diff --git a/lang/en_utf8/help/message/moodle_errors.html b/lang/en_utf8/help/message/moodle_errors.html
new file mode 100644
index 00000000000..a3965d91c8e
--- /dev/null
+++ b/lang/en_utf8/help/message/moodle_errors.html
@@ -0,0 +1,3 @@
+<h1>Moodle errors</h1>
+
+<p>These are important errors that an administrator should know about.</p>
diff --git a/lang/en_utf8/help/message/moodle_notices.html b/lang/en_utf8/help/message/moodle_notices.html
new file mode 100644
index 00000000000..2b324b15f70
--- /dev/null
+++ b/lang/en_utf8/help/message/moodle_notices.html
@@ -0,0 +1,3 @@
+<h1>Moodle notices</h1>
+
+<p>These are notices that an administrator might be interested in seeing.</p>
diff --git a/message/edit.php b/message/edit.php
index 8a52ea6449b..a339fc9cea3 100644
--- a/message/edit.php
+++ b/message/edit.php
@@ -212,7 +212,14 @@
 
     foreach ( $providers as $providerid => $provider){
         $providername = get_string('messageprovider:'.$provider->name, $provider->component);
-        $helpbtn = helpbutton(str_replace('/', '_', $provider->component).'_'.$provider->name, $providername, "messaging", true, false, '', true);
+
+    /// TODO XXX: This is only a quick hack ... helpfile locations should be provided as part of the provider definition
+        if ($provider->component == 'moodle') {
+            $helpbtn = helpbutton('moodle_'.$provider->name, $providername, 'message', true, false, '', true);
+        } else {
+            $helpbtn = helpbutton('message_'.$provider->name, $providername, basename($provider->component), true, false, '', true);
+        }
+
         echo '<tr><th align="right">'.$providername.$helpbtn.'</th><td colspan="'.$number_procs.'"></td></tr>'."\n";
         foreach (array('loggedin', 'loggedoff') as $state){
             $state_res = get_string($state, 'message');