diff --git a/message/tests/behat/message_participants.feature b/message/tests/behat/message_participants.feature
index 849e57b6e62..9a578da6675 100644
--- a/message/tests/behat/message_participants.feature
+++ b/message/tests/behat/message_participants.feature
@@ -35,3 +35,34 @@ Feature: An user can message course participants
     And I should see "Student 1"
     And I click on "this conversation" "link" in the "//div[@class='singlemessage'][contains(., 'Teacher 1')]" "xpath_element"
     And I should see "Here it is, the message content"
+
+  Scenario: An user can message multiple course participants including him/her self
+    Given the following "users" exist:
+      | username | firstname | lastname | email |
+      | teacher1 | Teacher | 1 | teacher1@example.com |
+      | student1 | Student | 1 | student1@example.com |
+      | student2 | Student | 2 | student2@example.com |
+      | student3 | Student | 3 | student3@example.com |
+    And the following "courses" exist:
+      | fullname | shortname | format |
+      | Course 1 | C1 | topics |
+    And the following "course enrolments" exist:
+      | user | course | role |
+      | teacher1 | C1 | editingteacher |
+      | student1 | C1 | student |
+    And I log in as "teacher1"
+    And I follow "Course 1"
+    And I follow "Participants"
+    When I set the field with xpath "//tr[contains(normalize-space(.), 'Teacher 1')]//input[@type='checkbox']" to "1"
+    And I set the field with xpath "//tr[contains(normalize-space(.), 'Student 1')]//input[@type='checkbox']" to "1"
+    And I set the field "With selected users..." to "Send a message"
+    And I press "OK"
+    And I set the following fields to these values:
+      | messagebody | Here it is, the message content |
+    And I press "Send message"
+    And I follow "Messages" in the user menu
+    And I select "Recent conversations" from the "Message navigation:" singleselect
+    Then I should see "Here it is, the message content"
+    And I should see "Student 1"
+    And I click on "this conversation" "link" in the "//div[@class='singlemessage'][contains(., 'Teacher 1')]" "xpath_element"
+    And I should see "Here it is, the message content"
\ No newline at end of file
diff --git a/user/message.html b/user/message.html
index 0e0ba935db1..b7fa69c76a4 100644
--- a/user/message.html
+++ b/user/message.html
@@ -24,7 +24,10 @@
     </td>
 </tr>
 
-<tr><td align="center" colspan="2"><input type="submit" name="preview" value="<?php print_string('preview'); ?>" /></td></tr>
+<tr><td align="center" colspan="2">
+        <input type="submit" name="send" value="<?php print_string('sendmessage', 'message'); ?>" />
+        <input type="submit" name="preview" value="<?php print_string('preview'); ?>" />
+</td></tr>
 </table>
 <?php echo $OUTPUT->box_end(); ?>
 <table align="center"><tr><th colspan="4" scope="row"><?php print_string('currentlyselectedusers'); ?></th></tr>
diff --git a/user/messageselect.php b/user/messageselect.php
index 56a22ddfaae..bc1b693b092 100644
--- a/user/messageselect.php
+++ b/user/messageselect.php
@@ -194,6 +194,12 @@ if (count($SESSION->emailto[$id])) {
     require("message.html");
 }
 
+$PAGE->requires->yui_module('moodle-core-formchangechecker',
+        'M.core_formchangechecker.init',
+        array(array(
+            'formid' => 'theform'
+        ))
+);
+$PAGE->requires->string_for_js('changesmadereallygoaway', 'moodle');
+
 echo $OUTPUT->footer();
-
-