diff --git a/message/lib.php b/message/lib.php
index 1f303cc729b..330744ebbae 100644
--- a/message/lib.php
+++ b/message/lib.php
@@ -268,7 +268,7 @@ function message_print_search() {
 function message_print_settings() {
     global $USER;
 
-    if ($frm = data_submitted()) {
+    if ($frm = data_submitted() and confirm_sesskey()) {
 
         $pref = array();
         $pref['message_showmessagewindow'] = (isset($frm->showmessagewindow)) ? '1' : '0';
diff --git a/message/settings.html b/message/settings.html
index 1c0ddcec9b2..fdd83757fe6 100644
--- a/message/settings.html
+++ b/message/settings.html
@@ -1,5 +1,6 @@
 <form id="message_settings" action="index.php" method="post">
 <input type="hidden" name="tab" value="settings" />
+<input type="hidden" name="sesskey" value="<?php echo sesskey() ?>" />
 
 
 <table cellpadding="5" align="center" class="message_form">