diff --git a/zephyr/static/js/compose.js b/zephyr/static/js/compose.js
index 4ae7b0021d..fdd0c961bc 100644
--- a/zephyr/static/js/compose.js
+++ b/zephyr/static/js/compose.js
@@ -94,7 +94,7 @@ exports.subject = function (newval) {
     return oldval;
 };
 
-exports.message = function (newval) {
+exports.message_content = function (newval) {
     var oldval = $.trim($("#new_message_content").val());
     if (newval !== undefined) {
         $("#new_message_content").val(newval);
@@ -167,7 +167,7 @@ function validate_stream_message() {
         return false;
     }
 
-    if (exports.message() === "") {
+    if (exports.message_content() === "") {
         compose_error("You have nothing to send!", $("#new_message_content"));
         return false;
     }
@@ -195,7 +195,7 @@ function validate_huddle_message() {
         return false;
     }
 
-    if (exports.message() === "") {
+    if (exports.message_content() === "") {
         compose_error("You have nothing to send!", $("#new_message_content"));
         return false;
     }
diff --git a/zephyr/static/js/zephyr.js b/zephyr/static/js/zephyr.js
index 0ce7beeaf7..a5882d8f28 100644
--- a/zephyr/static/js/zephyr.js
+++ b/zephyr/static/js/zephyr.js
@@ -543,7 +543,7 @@ function reload_app_preserving_compose(send_after_reload) {
         url += "+msg_type=huddle";
         url += "+recipient=" + encodeURIComponent(compose.recipient());
     }
-    url += "+msg="+ encodeURIComponent(compose.message());
+    url += "+msg="+ encodeURIComponent(compose.message_content());
 
     window.location.replace(url);
     do_reload_app();