diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesFragment.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesFragment.java
index 2373f5131..fd5b4a4b6 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesFragment.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesFragment.java
@@ -29,7 +29,6 @@ import android.widget.TextView;
 import android.widget.TextView.OnEditorActionListener;
 
 import com.timsu.astrid.R;
-import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.utility.AndroidUtilities;
@@ -193,22 +192,32 @@ public class TagUpdatesFragment extends ListFragment {
 
     private void refreshUpdatesList() {
 
+        Cursor cursor = null;
         if(updateAdapter == null) {
-            TodorooCursor<Update> currentCursor = tagDataService.getUpdates(tagData);
-            getActivity().startManagingCursor(currentCursor);
+            cursor = tagDataService.getUpdates(tagData);
+            getActivity().startManagingCursor(cursor);
             String fromUpdateClass = (tagData == null) ? UpdateAdapter.FROM_RECENT_ACTIVITY_VIEW : UpdateAdapter.FROM_TAG_VIEW;
 
             updateAdapter = new UpdateAdapter(this, R.layout.update_adapter_row,
-                    currentCursor, false, fromUpdateClass);
+                    cursor, false, fromUpdateClass);
             ListView listView = ((ListView) getView().findViewById(android.R.id.list));
             addHeaderToListView(listView);
             listView.setAdapter(updateAdapter);
         } else {
-            Cursor cursor = updateAdapter.getCursor();
+            cursor = updateAdapter.getCursor();
             cursor.requery();
             getActivity().startManagingCursor(cursor);
             populateListHeader(listHeader);
         }
+
+        View activityContainer = getView().findViewById(R.id.no_activity_container);
+        if (cursor.getCount() == 0) {
+            activityContainer.setVisibility(View.VISIBLE);
+        }
+        else {
+            activityContainer.setVisibility(View.VISIBLE);
+        }
+
         if (getActivity() instanceof TagUpdatesActivity)
             setLastViewed();
     }
diff --git a/astrid/res/drawable/welcome_activity.png b/astrid/res/drawable/welcome_activity.png
new file mode 100644
index 000000000..243d2ff58
Binary files /dev/null and b/astrid/res/drawable/welcome_activity.png differ
diff --git a/astrid/res/layout/tag_updates_fragment.xml b/astrid/res/layout/tag_updates_fragment.xml
index 9bcf7dfce..2608d0b72 100644
--- a/astrid/res/layout/tag_updates_fragment.xml
+++ b/astrid/res/layout/tag_updates_fragment.xml
@@ -14,6 +14,24 @@
         android:layout_weight="1"
         android:visibility="gone" />
 
+    <LinearLayout
+        android:id="@+id/no_activity_container"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_weight="100"
+        android:orientation="vertical"
+        android:visibility="gone">
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/welcome_activity" />
+
+        <TextView
+            android:id="@+id/no_activity_message"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+    </LinearLayout>
+
     <ListView
         android:id="@android:id/list"
         android:layout_width="fill_parent"