diff --git a/zephyr/static/js/tutorial.js b/zephyr/static/js/tutorial.js
index 91138eb6ca..59468ad1fb 100644
--- a/zephyr/static/js/tutorial.js
+++ b/zephyr/static/js/tutorial.js
@@ -28,7 +28,8 @@ function send_message(message) {
         dataType: 'json',
         url: '/json/tutorial_send_message',
         type: 'POST',
-        data: {'message': message}
+        data: {'type': 'private',
+               'content': message}
     });
 }
 
diff --git a/zephyr/views.py b/zephyr/views.py
index ada4b93158..0525926acc 100644
--- a/zephyr/views.py
+++ b/zephyr/views.py
@@ -645,22 +645,6 @@ def api_send_message(request, user_profile):
 def json_send_message(request, user_profile):
     return send_message_backend(request, user_profile, request._client)
 
-@authenticated_json_post_view
-@has_request_variables
-def json_tutorial_send_message(request, user_profile, message=POST('message')):
-    """
-    This function, used by the onboarding tutorial, causes the
-    Tutorial Bot to send you the message you pass in here.
-    (That way, the Tutorial Bot's messages to you get rendered
-     by the server and therefore look like any other message.)
-    """
-    internal_send_message("humbug+tutorial@humbughq.com",
-                          Recipient.PERSONAL,
-                          user_profile.user.email,
-                          "",
-                          message)
-    return json_success()
-
 @authenticated_json_post_view
 @has_request_variables
 def json_change_enter_sends(request, user_profile, enter_sends=POST('enter_sends', json_to_bool)):
@@ -767,6 +751,40 @@ def recipient_for_emails(emails, not_forged_zephyr_mirror, user_profile, sender)
         return Recipient.objects.get(type_id=list(recipient_profile_ids)[0],
                                      type=Recipient.PERSONAL)
 
+@authenticated_json_post_view
+@has_request_variables
+def json_tutorial_send_message(request, user_profile,
+                               message_type_name = POST('type'),
+                               subject_name = POST('subject', lambda x: x.strip(), None),
+                               message_content=POST('content')):
+    """
+    This function, used by the onboarding tutorial, causes the
+    Tutorial Bot to send you the message you pass in here.
+    (That way, the Tutorial Bot's messages to you get rendered
+     by the server and therefore look like any other message.)
+    """
+    sender_name = "humbug+tutorial@humbughq.com"
+    if message_type_name == 'private':
+        # For now, we discard the recipient on PMs; the tutorial bot
+        # can only send to you.
+        internal_send_message(sender_name,
+                              Recipient.PERSONAL,
+                              user_profile.user.email,
+                              "",
+                              message_content)
+        return json_success()
+    elif message_type_name == 'stream':
+        tutorial_stream_name = 'tutorial-%s' % user_profile.user.email.split('@')[0]
+        ## TODO: For open realms, we need to use the full name here,
+        ## so that me@gmail.com and me@hotmail.com don't get the same stream.
+        internal_send_message(sender_name,
+                              Recipient.STREAM,
+                              tutorial_stream_name,
+                              subject_name,
+                              message_content)
+        return json_success()
+    return json_error('Bad data passed in to tutorial_send_message')
+
 # We do not @require_login for send_message_backend, since it is used
 # both from the API and the web service.  Code calling
 # send_message_backend should either check the API key or check that