diff --git a/lang/en_utf8/chat.php b/lang/en_utf8/chat.php
index 34e59df5c87..cb1ac679d16 100644
--- a/lang/en_utf8/chat.php
+++ b/lang/en_utf8/chat.php
@@ -1,7 +1,8 @@
-<?PHP // $Id$ 
+<?PHP // $Id$
       // chat.php - created with Moodle 1.7 beta + (2006101003)
 
-
+$string['ajax'] = 'Version using Ajax';
+$string['autoscroll'] = 'Auto Scroll';
 $string['beep'] = 'beep';
 $string['cantlogin'] = 'Could not log in to chat room!!';
 $string['cantinsert'] = 'Could not insert a chat message!';
@@ -69,10 +70,13 @@ $string['servermax'] = 'Max users';
 $string['serverport'] = 'Server port';
 $string['savemessages'] = 'Save past sessions';
 $string['seesession'] = 'See this session';
+$string['send'] = 'Send';
+$string['sending'] = 'Sending';
 $string['sessions'] = 'Chat sessions';
 $string['strftimemessage'] = '%%H:%%M';
 $string['studentseereports'] = 'Everyone can view past sessions';
 $string['updatemethod'] = 'Update method';
+$string['updaterate'] = 'Update Rate: ';
 $string['viewreport'] = 'View past chat sessions';
 
 ?>
diff --git a/mod/chat/gui_header_js/chatinput.php b/mod/chat/gui_header_js/chatinput.php
index d859c5dbccc..18b35fcecc9 100644
--- a/mod/chat/gui_header_js/chatinput.php
+++ b/mod/chat/gui_header_js/chatinput.php
@@ -50,9 +50,10 @@
 
 ?>
     <form action="../empty.php" method="post" target="empty" id="inputForm"
-          onsubmit="return empty_field_and_submit()">
-        &gt;&gt;<input type="text" id="input_chat_message" name="chat_message" size="60" value="" />
-        <?php helpbutton('chatting', get_string('helpchatting', 'chat'), 'chat', true, false); ?>
+          onsubmit="return empty_field_and_submit()" style="margin:0">
+        <input type="text" id="input_chat_message" name="chat_message" size="50" value="" />
+        <?php helpbutton('chatting', get_string('helpchatting', 'chat'), 'chat', true, false); ?><br />
+        <input type="checkbox" id="auto" size="50" value="" checked /><?php echo get_string('autoscroll', 'chat');?>
     </form>
 
     <form action="insert.php" method="post" target="empty" id="sendForm">
diff --git a/mod/chat/gui_header_js/jsupdate.php b/mod/chat/gui_header_js/jsupdate.php
index 5d7ac74e85c..cd3cc71a53e 100644
--- a/mod/chat/gui_header_js/jsupdate.php
+++ b/mod/chat/gui_header_js/jsupdate.php
@@ -143,8 +143,9 @@
             }
         }
         ?>
-        if(parent.msg)
+        if(parent.msg && parent.input.document.getElementById('auto').checked){
             parent.msg.scroll(1,5000000);
+        }
         //]]>
         </script>
     </head>