diff --git a/application/src/org/yaaic/adapter/MessageListAdapter.java b/application/src/org/yaaic/adapter/MessageListAdapter.java
index 600e470..33bea86 100644
--- a/application/src/org/yaaic/adapter/MessageListAdapter.java
+++ b/application/src/org/yaaic/adapter/MessageListAdapter.java
@@ -26,6 +26,7 @@ import org.yaaic.model.Conversation;
 import org.yaaic.model.Message;
 
 import android.content.Context;
+import android.database.DataSetObserver;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
@@ -162,4 +163,15 @@ public class MessageListAdapter extends BaseAdapter
     {
         return getItem(position);
     }
+
+    /**
+     * XXX This is almost certainly covering up a bug elsewhere -- find it!
+     */
+    @Override
+    public void unregisterDataSetObserver(DataSetObserver observer) {
+        if (observer == null) {
+            return;
+        }
+        super.unregisterDataSetObserver(observer);
+    }
 }