diff --git a/lib/adminlib.php b/lib/adminlib.php
index 2dacc2f79b9..2ec445da6e7 100644
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -107,6 +107,7 @@ defined('MOODLE_INTERNAL') || die();
 /// Add libraries
 require_once($CFG->libdir.'/ddllib.php');
 require_once($CFG->libdir.'/xmlize.php');
+require_once($CFG->libdir.'/messagelib.php');
 
 define('INSECURE_DATAROOT_WARNING', 1);
 define('INSECURE_DATAROOT_ERROR', 2);
@@ -260,6 +261,9 @@ function uninstall_plugin($type, $name) {
     // delete the module configuration records
     unset_all_config_for_plugin($pluginname);
 
+    // delete message provider
+    message_uninstall($component);
+
     // delete the plugin tables
     $xmldbfilepath = $plugindirectory . '/db/install.xml';
     drop_plugin_tables($pluginname, $xmldbfilepath, false);
diff --git a/lib/messagelib.php b/lib/messagelib.php
index 9a095f50fa7..576f58a8d81 100644
--- a/lib/messagelib.php
+++ b/lib/messagelib.php
@@ -307,7 +307,7 @@ function message_get_providers_from_file($component) {
 
 /**
  * Remove all message providers
- * @param $component - examples: 'moodle', 'mod/forum', 'block/quiz_results'
+ * @param $component - examples: 'moodle', 'mod_forum', 'block_quiz_results'
  */
 function message_uninstall($component) {
     global $DB;