diff --git a/lang/en/message.php b/lang/en/message.php
index 60993bc..34ba71a 100644
--- a/lang/en/message.php
+++ b/lang/en/message.php
@@ -140,3 +140,4 @@ $string['unreadnewnotifications'] = 'New notifications ({$a})';
 $string['userisblockingyou'] = 'This user has blocked you from sending messages to them';
 $string['userisblockingyounoncontact'] = 'This user is only accepting messages from people listed as contacts, and you are not currently on the list.';
 $string['userssearchresults'] = 'Users found: {$a}';
+$string['finishedpreview'] = 'Finished'; // Added BY: David Varney <david.varney@eschoolconsultants.com>
diff --git a/user/message.php b/user/message.php
new file mode 100644
index 0000000..499ceea
--- /dev/null
+++ b/user/message.php
@@ -0,0 +1,85 @@
+<?php
+
+if (!defined('MOODLE_INTERNAL')) {
+    die('Direct access to this script is forbidden.');    ///  It must be included from a Moodle page
+}
+require_once($CFG->dirroot.'/lib/formslib.php');
+
+class message_user_form extends moodleform {
+
+    function definition () {
+        global $USER;
+
+        $mform =& $this->_form;
+
+        $editoroptions = array('trusttext'=>false);
+
+        // Let's assign our hidden form elements
+        $mform->addElement('hidden', 'id');
+        $mform->setType('id', PARAM_INT);
+        $mform->addElement('hidden', 'returnto');
+        $mform->addElement('hidden', 'deluser');
+
+        $mform->addElement('editor', 'messagebody', '<b>'.get_string('messagebody').':</b>', null, $editoroptions);
+
+        if (has_capability('local/eschool:messageguardian', get_context_instance(CONTEXT_SYSTEM), $USER->id, true)) {
+            $mform->addElement('checkbox', 'guardians', '', '&nbsp;Message students\' guardians instead of the students themselves');
+            $mform->setDefault('guardians', false);
+        }
+
+        $mform->addElement('submit', 'preview', get_string('preview'));
+        $mform->addElement('submit', 'send', get_string('sendmessage', 'message'));
+
+    }
+
+    /**
+     * Assigns the recipient users to the form
+     *
+     * @author David Varney <david.varney@eschoolconsultants.com>
+     *
+     * @param obj $id Id of the course to access $SESSION->emailto
+     */
+    function assign_users_to_form($id){
+        global $SESSION, $OUTPUT;
+
+        $this->_form->addElement('html', '<table align="center"><tr><th colspan="4" scope="row">'.get_string('currentlyselectedusers').'</th></tr>');
+
+        if (count($SESSION->emailto[$id])) {
+            foreach ($SESSION->emailto[$id] as $user) {
+                $this->_form->addElement('html', '<tr><td>'.fullname($user,true).'</td>');
+                // Check to see if we should be showing the email address.
+                if ($user->maildisplay == 0) { // 0 = don't display my email to anyone.
+                    $this->_form->addElement('html', '<td>'. get_string('emaildisplayhidden') .'</td><td>');
+                } else {
+                    $this->_form->addElement('html', '<td>'.$user->email.'</td><td>');
+                }
+                if (empty($user->email)) {
+                    $error = get_string('emailempty');
+                }
+                if (!empty($error)) {
+                    $this->_form->addElement('html', '<img src="'.$OUTPUT->pix_url('t/emailno') . '" alt="'.$error.'" title="'.$error.'"/>');
+                    unset($error);
+                }
+                $this->_form->addElement('html', '</td><td><input type="submit" onClick="this.form.deluser.value='.$user->id.';" value="' . get_string('remove') . '" /></td></tr>');
+            }
+        }
+        else {
+            $this->_form->addElement('html', '<tr><td colspan="3" align="center">'.get_string('nousersyet').'</td></tr>');
+        }
+        $this->_form->addElement('html', '</table>');
+    }
+
+    /**
+     * Used to structure incoming data for the message editor component
+     *
+     * @param obj $data
+     */
+    function set_data($data) {
+        $data->message = array('text'=>$data->message, 'format'=>$data->messageformat);
+
+        parent::set_data($data);
+    }
+
+}
+
+?>
diff --git a/user/messageselect.php b/user/messageselect.php
index a031892..fba8b64 100644
--- a/user/messageselect.php
+++ b/user/messageselect.php
@@ -25,15 +25,16 @@
 
 require_once('../config.php');
 require_once($CFG->dirroot.'/message/lib.php');
+require_once($CFG->dirroot.'/user/message.php');
 
 $id = required_param('id',PARAM_INT);
-$messagebody = optional_param('messagebody','',PARAM_CLEANHTML);
+$messagebody = clean_param($_POST['messagebody']['text'], PARAM_CLEANHTML);
 $send = optional_param('send','',PARAM_BOOL);
 $preview = optional_param('preview','',PARAM_BOOL);
 $edit = optional_param('edit','',PARAM_BOOL);
 $guardians = optional_param('guardians','',PARAM_BOOL);
 $returnto = optional_param('returnto','',PARAM_LOCALURL);
-$format = optional_param('format',FORMAT_MOODLE,PARAM_INT);
+$format = clean_param($_POST['messagebody']['format'], PARAM_INT);
 $deluser = optional_param('deluser',0,PARAM_INT);
 
 $url = new moodle_url('/user/messageselect.php', array('id'=>$id));
@@ -141,13 +142,11 @@ if (!empty($messagebody) && !$edit && !$deluser && ($preview || $send)) {
             echo '<form method="post" action="messageselect.php" style="margin: 0 20px;">
 <input type="hidden" name="returnto" value="'.s($returnto).'" />
 <input type="hidden" name="id" value="'.$id.'" />
-<input type="hidden" name="format" value="'.$format.'" />
 <input type = "hidden" name = "guardians" value = "' . $guardians . '" />';
 
 
             echo "<h3>".get_string('previewhtml')."</h3><div class=\"messagepreview\">\n".format_text($messagebody,$format)."\n</div>\n";
-            echo '<p align="center"><input type="submit" name="send" value="'.get_string('sendmessage', 'message').'" />'."\n";
-            echo '<input type="submit" name="edit" value="'.get_string('update').'" /></p>';
+            echo '<input type="submit" name="edit" value="'.get_string('finishedpreview', 'message').'" /></p>';
             echo "\n</form>";
         } else if (!empty($send)) {
             $good = 1;
@@ -185,8 +184,21 @@ if ((!empty($send) || !empty($preview) || !empty($edit)) && (empty($messagebody)
 }
 
 if (count($SESSION->emailto[$id])) {
-    $usehtmleditor = can_use_html_editor();
-    require("message.html");
+    if (has_capability('moodle/site:sendmessage', $systemcontext)) {
+            $mform = new message_user_form('messageselect.php');
+            $defaultmessage = new stdClass;
+            $defaultmessage->id = $id;
+            $defaultmessage->messagebody['text'] = '';//$messagebody;
+            $defaultmessage->returnto = $returnto;
+            $defaultmessage->deluser = $deluser;
+            $defaultmessage->guardians = $guardians;
+             // Let's add all of the users that this message is going to
+            $mform->assign_users_to_form($id);
+            $mform->set_data($defaultmessage);
+        echo $OUTPUT->box_start();
+            $mform->display();
+        echo $OUTPUT->box_end();
+    }
 }
 
 echo $OUTPUT->footer();