diff --git a/message/discussion.php b/message/discussion.php
index 00d3c0b1214..ce0704f2503 100644
--- a/message/discussion.php
+++ b/message/discussion.php
@@ -263,7 +263,7 @@
                 '<span class="time">['.$time.']</span>: '.
                 '<span class="content">'.$printmessage.'</span></div>';
             $i=0;
-            $sortkey = $message->timecreated."$i"; // we need string bacause we would run out of int range
+            $sortkey = $message->timecreated."$i"; // we need string because we would run out of int range
             while (array_key_exists($sortkey, $allmessages)) {
                 $i++;
                 $sortkey = $message->timecreated."$i";
@@ -285,7 +285,7 @@
                 '<span class="time">['.$time.']</span>: '.
                 '<span class="content">'.$printmessage.'</span></div>';
             $i=0;
-            $sortkey = $message->timecreated."$i"; // we need string bacause we would run out of int range
+            $sortkey = $message->timecreated."$i"; // we need string because we would run out of int range
             while (array_key_exists($sortkey, $allmessages)) {
                 $i++;
                 $sortkey = $message->timecreated."$i";
@@ -293,7 +293,7 @@
             $allmessages[$sortkey] = $printmessage;
         }
     }
-    /*Get still to be read message, use message/lib.php funtion*/
+    /*Get still to be read message, use message/lib.php function*/
     $messages = message_get_popup_messages($USER->id, $userid);
     if ($messages) {
         foreach ($messages as $message) {
@@ -308,7 +308,7 @@
                 '<span class="time">['.$time.']</span>: '.
                 '<span class="content">'.$printmessage.'</span></div>';
             $i=0;
-            $sortkey = $message->timecreated."$i"; // we need string bacause we would run out of int range
+            $sortkey = $message->timecreated."$i"; // we need string because we would run out of int range
             while (array_key_exists($sortkey, $allmessages)) {
                 $i++;
                 $sortkey = $message->timecreated."$i";
@@ -331,7 +331,7 @@
                 '<span class="time">['.$time.']</span>: '.
                 '<span class="content">'.$printmessage.'</span></div>';
             $i=0;
-            $sortkey = $message->timecreated."$i"; // we need string bacause we would run out of int range
+            $sortkey = $message->timecreated."$i"; // we need string because we would run out of int range
             while (array_key_exists($sortkey, $allmessages)) {
                 $i++;
                 $sortkey = $message->timecreated."$i";
diff --git a/message/edit.php b/message/edit.php
index c95a73e90ec..3a857ca1297 100644
--- a/message/edit.php
+++ b/message/edit.php
@@ -90,7 +90,7 @@ if ($user->id == $USER->id) {
     $PAGE->navigation->extend_for_user($user);
 }
 
-/// Save new preferences if data was submited
+/// Save new preferences if data was submitted
 
 if (($form = data_submitted()) && confirm_sesskey()) {
     $preferences = array();
diff --git a/message/index.php b/message/index.php
index ae533b94f5b..73c1a6b0af5 100644
--- a/message/index.php
+++ b/message/index.php
@@ -122,7 +122,7 @@ if (!empty($user2id)) {
 }
 unset($user2id);
 
-//was a message sent? Do NOT allow someone looking at somone elses messages to send them.
+//was a message sent? Do NOT allow someone looking at someone else's messages to send them.
 $messageerror = null;
 if ($currentuser && !empty($user2) && has_capability('moodle/site:sendmessage', $context)) {
 
diff --git a/message/lib.php b/message/lib.php
index 2baeca22e68..d785c367aa0 100644
--- a/message/lib.php
+++ b/message/lib.php
@@ -108,7 +108,7 @@ function message_print_contact_selector($countunreadtotal, $usergroup, $user1, $
 
                 message_print_participants($coursecontexts[$courseidtoshow], $courseidtoshow, $PAGE->url, $showcontactactionlinks);
             } else {
-                //shouldnt get here. User trying to access a course theyre not in perhaps.
+                //shouldn't get here. User trying to access a course they're not in perhaps.
                 add_to_log(SITEID, 'message', 'view', 'index.php', $usergroup);
             }
         }
@@ -869,7 +869,7 @@ function message_print_search_results($frm, $showicontext=false, $user1=null) {
                 echo '<td class="summary">'.message_get_fragment($message->fullmessage, $keywords);
                 echo '<br /><div class="link">';
 
-                //find the user involved that isnt the current user
+                //find the user involved that isn't the current user
                 $user2id = null;
                 if ($user1->id == $message->useridto) {
                     $user2id = $message->useridfrom;
@@ -896,7 +896,7 @@ function message_print_search_results($frm, $showicontext=false, $user1=null) {
     }
 
     if (!$personsearch && !$messagesearch) {
-        //they didnt enter any search terms
+        //they didn't enter any search terms
         echo $OUTPUT->notification(get_string('emptysearchstring', 'message'));
     }
 
@@ -1452,6 +1452,7 @@ function message_print_message_history($user1,$user2,$search='',$messagelimit=0,
     if ($messages = message_get_history($user1, $user2, $messagelimit)) {
         $tablecontents = '';
 
+        $current = new object();
         $current->mday = '';
         $current->month = '';
         $current->year = '';
@@ -1634,7 +1635,7 @@ function message_move_userfrom_unread2read($userid) {
 
     global $DB;
 
-    // move all unread messages from message table to messasge_read
+    // move all unread messages from message table to message_read
     if ($messages = $DB->get_records_select('message', 'useridfrom = ?', array($userid), 'timecreated')) {
         foreach ($messages as $message) {
             $message->timeread = 0; //the message was never read
diff --git a/message/output/email/message_output_email.php b/message/output/email/message_output_email.php
index dbb6f2b0388..de6eb00aaab 100644
--- a/message/output/email/message_output_email.php
+++ b/message/output/email/message_output_email.php
@@ -72,7 +72,7 @@ class message_output_email extends message_output {
     }
 
     /**
-     * Parses the form submited data and saves it into preferences array.
+     * Parses the form submitted data and saves it into preferences array.
      * @param object $mform preferences form class
      * @param array $preferences preferences array
      */
diff --git a/message/output/jabber/message_output_jabber.php b/message/output/jabber/message_output_jabber.php
index a93fe964d39..21259948d37 100644
--- a/message/output/jabber/message_output_jabber.php
+++ b/message/output/jabber/message_output_jabber.php
@@ -86,7 +86,7 @@ class message_output_jabber extends message_output {
     }
 
     /**
-     * Parses the form submited data and saves it into preferences array.
+     * Parses the form submitted data and saves it into preferences array.
      * @param object $mform preferences form class
      * @param array $preferences preferences array
      */
diff --git a/message/refresh.php b/message/refresh.php
index cde70e5082b..9d5f53203d6 100644
--- a/message/refresh.php
+++ b/message/refresh.php
@@ -50,7 +50,7 @@ $userid       = required_param('id', PARAM_INT);
 $userfullname = strip_tags(required_param('name', PARAM_RAW));
 $wait         = optional_param('wait', MESSAGE_DEFAULT_REFRESH, PARAM_INT);
 
-/*Get still to be read message, use message/lib.php funtion*/
+/*Get still to be read message, use message/lib.php function*/
 $messages = message_get_popup_messages($USER->id, $userid);
 $jsmessages = Array();
 if ($messages ) {