diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index 0e3ac9c1..e92bc180 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -92,6 +92,12 @@ class ReplyForm(CustomForm):
'user', 'content', 'content_warning', 'sensitive',
'reply_parent', 'privacy']
+class StatusForm(CustomForm):
+ class Meta:
+ model = models.Status
+ fields = [
+ 'user', 'content', 'content_warning', 'sensitive', 'privacy']
+
class EditUserForm(CustomForm):
class Meta:
diff --git a/bookwyrm/templates/feed/direct_messages.html b/bookwyrm/templates/feed/direct_messages.html
index 44a0cded..1f41808f 100644
--- a/bookwyrm/templates/feed/direct_messages.html
+++ b/bookwyrm/templates/feed/direct_messages.html
@@ -4,16 +4,22 @@
Direct Messages
- {% if not activities %}
-
You have no messages right now.
- {% endif %}
- {% for activity in activities %}
-
- {% include 'snippets/status.html' with status=activity %}
+
+ {% include 'snippets/create_status_form.html' with type="direct" uuid=1 %}
- {% endfor %}
- {% include 'snippets/pagination.html' with page=activities path="direct-messages" %}
+
+ {% if not activities %}
+ You have no messages right now.
+ {% endif %}
+ {% for activity in activities %}
+
+ {% include 'snippets/status.html' with status=activity %}
+
+ {% endfor %}
+
+ {% include 'snippets/pagination.html' with page=activities path="direct-messages" %}
+
{% endblock %}
diff --git a/bookwyrm/templates/feed/feed_layout.html b/bookwyrm/templates/feed/feed_layout.html
index 33123ca8..f0c7b057 100644
--- a/bookwyrm/templates/feed/feed_layout.html
+++ b/bookwyrm/templates/feed/feed_layout.html
@@ -76,7 +76,7 @@
{% block panel %}{% endblock %}
{% if activities %}
- {% include 'snippets/pagination.html' with page=activities path='/'|add:tab anchor="#feed" %}
+ {% include 'snippets/pagination.html' with page=activities path=path anchor="#feed" %}
{% endif %}
diff --git a/bookwyrm/templates/snippets/create_status_form.html b/bookwyrm/templates/snippets/create_status_form.html
index 0c2ebbee..534ace29 100644
--- a/bookwyrm/templates/snippets/create_status_form.html
+++ b/bookwyrm/templates/snippets/create_status_form.html
@@ -1,5 +1,5 @@
{% load bookwyrm_tags %}
-