diff --git a/tailbone/views/messages.py b/tailbone/views/messages.py
index f4c1648c..7371e2e9 100644
--- a/tailbone/views/messages.py
+++ b/tailbone/views/messages.py
@@ -277,11 +277,17 @@ class MessageView(MasterView):
                     value = [r[0] for r in value]
                     if old_message.sender is not self.request.user and old_message.sender.active:
                         value.insert(0, old_message.sender_uuid)
-                    f.set_default('set_recipients', ','.join(value))
+                    if use_buefy:
+                        f.set_default('set_recipients', value)
+                    else:
+                        f.set_default('set_recipients', ','.join(value))
 
                 # Just a normal reply, to sender only.
                 elif self.filter_reply_recipient(old_message.sender):
-                    f.set_default('set_recipients', old_message.sender.uuid)
+                    if use_buefy:
+                        f.set_default('set_recipients', [old_message.sender.uuid])
+                    else:
+                        f.set_default('set_recipients', old_message.sender.uuid)
 
                 # TODO?
                 # # Set focus to message body instead of recipients, when replying.