4 files changed, 12 insertions, 21 deletions
diff --git a/mod/messages/start.php b/mod/messages/start.php
index 24787ae03..5c4081a7b 100644
--- a/mod/messages/start.php
+++ b/mod/messages/start.php
@@ -49,7 +49,8 @@ function messages_init() {
 
 	// Extend system CSS with our own styles, which are defined in the messages/css view
 	elgg_extend_view('css/elgg', 'messages/css');
-
+	elgg_extend_view('js/elgg', 'messages/js');
+	
 	// Register a page handler, so we can have nice URLs
 	elgg_register_page_handler('messages', 'messages_page_handler');
 
diff --git a/mod/messages/views/default/forms/messages/process.php b/mod/messages/views/default/forms/messages/process.php
index e415a092b..8eab26297 100644
--- a/mod/messages/views/default/forms/messages/process.php
+++ b/mod/messages/views/default/forms/messages/process.php
@@ -31,13 +31,3 @@ echo elgg_view('input/button', array(
 ));
 
 echo '</div>';
-
-?>
-<?php //@todo JS 1.8: no ?>
-<script type="text/javascript">
-$(document).ready(function() {
-	$("#messages-toggle").click(function() {
-		$('input[type=checkbox]').click();
-	});
-});
-</script>
diff --git a/mod/messages/views/default/forms/messages/reply.php b/mod/messages/views/default/forms/messages/reply.php
index 2288f25f4..e8a27f03e 100644
--- a/mod/messages/views/default/forms/messages/reply.php
+++ b/mod/messages/views/default/forms/messages/reply.php
@@ -35,13 +35,4 @@ echo elgg_view('input/hidden', array(
 </div>
 <div>
 	<?php echo elgg_view('input/submit', array('value' => elgg_echo('messages:send'))); ?>
-</div>
-
-<script type="text/javascript">
-$(document).ready(function() {
-	$("#messages-show-reply").click(function() {
-		$('#messages-reply-form').slideToggle('medium');
-	});
-});
-	
-</script>
-\ No newline at end of file
+</div>
+\ No newline at end of file
diff --git a/mod/messages/views/default/messages/js.php b/mod/messages/views/default/messages/js.php
new file mode 100644
index 000000000..7ae5f8a08
--- /dev/null
+++ b/mod/messages/views/default/messages/js.php
@@ -0,0 +1,9 @@
+$(function() {
+	$("#messages-toggle").click(function() {
+		$('input[type=checkbox]').click();
+	});
+	
+	$("#messages-show-reply").click(function() {
+		$('#messages-reply-form').slideToggle('medium');
+	});
+});
+\ No newline at end of file