diff --git a/res/drawable-hdpi/inbox_zero.png b/res/drawable-hdpi/inbox_zero.png
new file mode 100644
index 000000000..fb95a35cd
Binary files /dev/null and b/res/drawable-hdpi/inbox_zero.png differ
diff --git a/res/drawable-mdpi/inbox_zero.png b/res/drawable-mdpi/inbox_zero.png
new file mode 100644
index 000000000..7018fde64
Binary files /dev/null and b/res/drawable-mdpi/inbox_zero.png differ
diff --git a/res/drawable-xhdpi/inbox_zero.png b/res/drawable-xhdpi/inbox_zero.png
new file mode 100644
index 000000000..ca25d05ca
Binary files /dev/null and b/res/drawable-xhdpi/inbox_zero.png differ
diff --git a/res/drawable-xxhdpi/inbox_zero.png b/res/drawable-xxhdpi/inbox_zero.png
new file mode 100644
index 000000000..a4b069614
Binary files /dev/null and b/res/drawable-xxhdpi/inbox_zero.png differ
diff --git a/res/drawable-xxxhdpi/inbox_zero.png b/res/drawable-xxxhdpi/inbox_zero.png
new file mode 100644
index 000000000..7f3fc7a3f
Binary files /dev/null and b/res/drawable-xxxhdpi/inbox_zero.png differ
diff --git a/res/layout/conversation_list_item_inbox_zero.xml b/res/layout/conversation_list_item_inbox_zero.xml
new file mode 100644
index 000000000..149e45ad9
--- /dev/null
+++ b/res/layout/conversation_list_item_inbox_zero.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<org.thoughtcrime.securesms.ConversationListItemInboxZero
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="30dp">
+
+    <TextView android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:textSize="25sp"
+              android:gravity="center"
+              android:padding="16dp"
+              android:text="@string/conversation_list_item_inbox_zero__inbox_zeeerrro"/>
+
+    <ImageView
+            android:layout_gravity="center"
+            android:src="@drawable/inbox_zero"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+
+    <TextView android:id="@+id/description"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:gravity="center"
+              android:textSize="20sp"
+              android:padding="16dp"
+              android:text="@string/conversation_list_item_inbox_zero__zip_zilch_zero_nada_nyou_re_all_caught_up"/>
+
+</org.thoughtcrime.securesms.ConversationListItemInboxZero>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c47a24118..53d762036 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1491,6 +1491,8 @@
     <string name="registration_activity__verify_your_number">Verify Your Number</string>
     <string name="registration_activity__please_enter_your_mobile_number_to_receive_a_verification_code_carrier_rates_may_apply">Please enter your mobile number to receive a verification code. Carrier rates may apply.</string>
     <string name="conversation_list_fragment__give_your_inbox_something_to_write_home_about_get_started_by_messaging_a_friend">Give your inbox something to write home about. Get started by messaging a friend.</string>
+    <string name="conversation_list_item_inbox_zero__inbox_zeeerrro">Inbox zeeerrro</string>
+    <string name="conversation_list_item_inbox_zero__zip_zilch_zero_nada_nyou_re_all_caught_up">Zip. Zilch. Zero. Nada. You\'re all caught up!</string>
 
 
     <!-- EOF -->
diff --git a/src/org/thoughtcrime/securesms/ConversationListAdapter.java b/src/org/thoughtcrime/securesms/ConversationListAdapter.java
index f6b7fd5a3..16d74d364 100644
--- a/src/org/thoughtcrime/securesms/ConversationListAdapter.java
+++ b/src/org/thoughtcrime/securesms/ConversationListAdapter.java
@@ -50,6 +50,7 @@ class ConversationListAdapter extends CursorRecyclerViewAdapter<ConversationList
 
   private static final int MESSAGE_TYPE_SWITCH_ARCHIVE = 1;
   private static final int MESSAGE_TYPE_THREAD         = 2;
+  private static final int MESSAGE_TYPE_INBOX_ZERO     = 3;
 
   private final @NonNull  ThreadDatabase    threadDatabase;
   private final @NonNull  MasterSecret      masterSecret;
@@ -107,14 +108,16 @@ class ConversationListAdapter extends CursorRecyclerViewAdapter<ConversationList
   @Override
   public ViewHolder onCreateItemViewHolder(ViewGroup parent, int viewType) {
     if (viewType == MESSAGE_TYPE_SWITCH_ARCHIVE) {
-      ConversationListItemAction action = (ConversationListItemAction)inflater.inflate(R.layout.conversation_list_item_action,
-                                                                                       parent, false);
+      ConversationListItemAction action = (ConversationListItemAction) inflater.inflate(R.layout.conversation_list_item_action,
+                                                                                        parent, false);
 
       action.setOnClickListener(v -> {
         if (clickListener != null) clickListener.onSwitchToArchive();
       });
 
       return new ViewHolder(action);
+    } else if (viewType == MESSAGE_TYPE_INBOX_ZERO) {
+      return new ViewHolder((ConversationListItemInboxZero)inflater.inflate(R.layout.conversation_list_item_inbox_zero, parent, false));
     } else {
       final ConversationListItem item = (ConversationListItem)inflater.inflate(R.layout.conversation_list_item_view,
                                                                                parent, false);
@@ -148,6 +151,8 @@ class ConversationListAdapter extends CursorRecyclerViewAdapter<ConversationList
 
     if (threadRecord.getDistributionType() == ThreadDatabase.DistributionTypes.ARCHIVE) {
       return MESSAGE_TYPE_SWITCH_ARCHIVE;
+    } else if (threadRecord.getDistributionType() == ThreadDatabase.DistributionTypes.INBOX_ZERO) {
+      return MESSAGE_TYPE_INBOX_ZERO;
     } else {
       return MESSAGE_TYPE_THREAD;
     }
diff --git a/src/org/thoughtcrime/securesms/ConversationListItemInboxZero.java b/src/org/thoughtcrime/securesms/ConversationListItemInboxZero.java
new file mode 100644
index 000000000..336f629bf
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/ConversationListItemInboxZero.java
@@ -0,0 +1,46 @@
+package org.thoughtcrime.securesms;
+
+
+import android.content.Context;
+import android.os.Build;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.annotation.RequiresApi;
+import android.util.AttributeSet;
+import android.widget.LinearLayout;
+
+import org.thoughtcrime.securesms.crypto.MasterSecret;
+import org.thoughtcrime.securesms.database.model.ThreadRecord;
+import org.thoughtcrime.securesms.mms.GlideRequests;
+
+import java.util.Locale;
+import java.util.Set;
+
+public class ConversationListItemInboxZero extends LinearLayout implements BindableConversationListItem{
+  public ConversationListItemInboxZero(Context context) {
+    super(context);
+  }
+
+  public ConversationListItemInboxZero(Context context, @Nullable AttributeSet attrs) {
+    super(context, attrs);
+  }
+
+  public ConversationListItemInboxZero(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+    super(context, attrs, defStyleAttr);
+  }
+
+  @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+  public ConversationListItemInboxZero(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+    super(context, attrs, defStyleAttr, defStyleRes);
+  }
+
+  @Override
+  public void unbind() {
+
+  }
+
+  @Override
+  public void bind(@NonNull MasterSecret masterSecret, @NonNull ThreadRecord thread, @NonNull GlideRequests glideRequests, @NonNull Locale locale, @NonNull Set<Long> selectedThreads, boolean batchMode) {
+
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/database/ThreadDatabase.java b/src/org/thoughtcrime/securesms/database/ThreadDatabase.java
index 943d517d0..9d72d5d3c 100644
--- a/src/org/thoughtcrime/securesms/database/ThreadDatabase.java
+++ b/src/org/thoughtcrime/securesms/database/ThreadDatabase.java
@@ -608,6 +608,7 @@ public class ThreadDatabase extends Database {
     public static final int BROADCAST    = 1;
     public static final int CONVERSATION = 2;
     public static final int ARCHIVE      = 3;
+    public static final int INBOX_ZERO   = 4;
   }
 
   public class Reader {
@@ -635,7 +636,7 @@ public class ThreadDatabase extends Database {
       Optional<RecipientSettings> settings;
       Optional<GroupRecord>       groupRecord;
 
-      if (distributionType != DistributionTypes.ARCHIVE) {
+      if (distributionType != DistributionTypes.ARCHIVE && distributionType != DistributionTypes.INBOX_ZERO) {
         settings    = DatabaseFactory.getRecipientDatabase(context).getRecipientSettings(cursor);
         groupRecord = DatabaseFactory.getGroupDatabase(context).getGroup(cursor);
       } else {
diff --git a/src/org/thoughtcrime/securesms/database/loaders/ConversationListLoader.java b/src/org/thoughtcrime/securesms/database/loaders/ConversationListLoader.java
index 1d527fd94..0620f3178 100644
--- a/src/org/thoughtcrime/securesms/database/loaders/ConversationListLoader.java
+++ b/src/org/thoughtcrime/securesms/database/loaders/ConversationListLoader.java
@@ -47,10 +47,17 @@ public class ConversationListLoader extends AbstractCursorLoader {
           ThreadDatabase.ARCHIVED, ThreadDatabase.STATUS, ThreadDatabase.DELIVERY_RECEIPT_COUNT,
           ThreadDatabase.EXPIRES_IN, ThreadDatabase.LAST_SEEN, ThreadDatabase.READ_RECEIPT_COUNT}, 1);
 
+
+      if (cursorList.get(0).getCount() <= 0) {
+        switchToArchiveCursor.addRow(new Object[] {-1L, System.currentTimeMillis(), archivedCount,
+                                                   "-1", null, 1, ThreadDatabase.DistributionTypes.INBOX_ZERO,
+                                                   0, null, 0, -1, 0, 0, 0, -1});
+      }
+
       switchToArchiveCursor.addRow(new Object[] {-1L, System.currentTimeMillis(), archivedCount,
                                                  "-1", null, 1, ThreadDatabase.DistributionTypes.ARCHIVE,
                                                  0, null, 0, -1, 0, 0, 0, -1});
-      
+
       cursorList.add(switchToArchiveCursor);
     }