diff --git a/res/menu/conversation.xml b/res/menu/conversation.xml
index 90df2dfd30b..30ed5acfc69 100644
--- a/res/menu/conversation.xml
+++ b/res/menu/conversation.xml
@@ -13,4 +13,8 @@
           android:id="@+id/menu_delete_thread"
           android:icon="@android:drawable/ic_menu_delete" />
 
+    <item android:title="@string/conversation__menu_unread_thread"
+          android:id="@+id/menu_unread_thread"
+          android:icon="@android:drawable/ic_dialog_email" />
+
 </menu>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c9e91fa0ad9..190388ed4e7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -815,6 +815,7 @@
     <string name="conversation__menu_leave_group">Leave Group</string>
     <string name="conversation__menu_add_contact_info">Add contact info</string>
     <string name="conversation__menu_delete_thread">Delete thread</string>
+    <string name="conversation__menu_unread_thread">Mark thread as unread</string>
 
     <!-- conversation_group_options -->
     <string name="convesation_group_options__recipients_list">Recipients list</string>
diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index a154fc3c38e..b4b9e24559a 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -294,6 +294,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
     switch (item.getItemId()) {
     case R.id.menu_call:                      handleDial(getRecipients().getPrimaryRecipient()); return true;
     case R.id.menu_delete_thread:             handleDeleteThread();                              return true;
+    case R.id.menu_unread_thread:             handleUnreadThread();                              return true;
     case R.id.menu_add_contact_info:          handleAddContactInfo();                            return true;
     case R.id.menu_add_attachment:            handleAddAttachment();                             return true;
     case R.id.menu_start_secure_session:      handleStartSecureSession();                        return true;
@@ -538,6 +539,10 @@ public void onClick(DialogInterface dialog, int which) {
     builder.show();
   }
 
+  private void handleUnreadThread() {
+    DatabaseFactory.getThreadDatabase(ConversationActivity.this).setUnread(threadId);
+  }
+
   private void handleAddContactInfo() {
     Intent intent = new Intent(Intent.ACTION_PICK, ContactsContract.Contacts.CONTENT_URI);
     startActivityForResult(intent, PICK_CONTACT_INFO);