diff --git a/backbone-couchdb.coffee b/backbone-couchdb.coffee
index e9acc85..dc74ae0 100644
--- a/backbone-couchdb.coffee
+++ b/backbone-couchdb.coffee
@@ -120,7 +120,7 @@ class Backbone.Collection extends Backbone.Collection
   # Manually start listening to real time updates
   listen_to_changes : ->
     # don't enable changes feed a second time
-    unless @_db_changes_enabled 
+    unless @_db_changes_enabled
       @_db_changes_enabled = true
       @_db_inst = con.helpers.make_db() unless @_db_inst
       @_db_inst.info
@@ -151,7 +151,7 @@ class Backbone.Collection extends Backbone.Collection
       if obj?
         # remove from collection if doc has been deleted on the server
         if _doc.deleted
-          @remove obj 
+          @remove obj
         else
           # set new values if _revs are not the same
           obj.set _doc.doc unless obj.get("_rev") == _doc.doc._rev 
diff --git a/chat_example/_attachments/index.html b/chat_example/_attachments/index.html
index 21d4e7a..4364942 100644
--- a/chat_example/_attachments/index.html
+++ b/chat_example/_attachments/index.html
@@ -24,7 +24,7 @@
     </div>
 
     <script type="text/template" id="entry-template">
-        <span class="from_content">{{from}}: </span><span class="text_content">{{message}}</span>
+        <span class="from_content">{{from}}: </span><span class="text_content">{{message}}</span><span class="delete">X</span>
     </script>
 
     <script type="text/template" id="private-entry-template">
diff --git a/chat_example/_attachments/js/app.js b/chat_example/_attachments/js/app.js
index 3360a30..92cc01b 100644
--- a/chat_example/_attachments/js/app.js
+++ b/chat_example/_attachments/js/app.js
@@ -40,6 +40,10 @@ $(function(){
     db : {
       view : "messages",
       changes : true,
+      // If you don't know what filters are in CouchDB, then read it up here:
+      // <a href="http://guide.couchdb.org/draft/notifications.html#filters">http://guide.couchdb.org/draft/notifications.html#filters</a>
+      // Look up how the filter works in `chat_example/filters/private_messages.js`.
+      // IMPORTANT: see `filters/messages.js` to see how to retrieve remove events
       filter : Backbone.couch_connector.config.ddoc_name + "/messages"
     },
     // The couchdb-connector is capable of mapping the url scheme
@@ -54,7 +58,7 @@ $(function(){
   });
   
   var Messages = new MessagesList();
-  
+
   var PrivateMessage = MessageModel.extend({
   });
   
@@ -64,9 +68,6 @@ $(function(){
       view : "none__",
       changes : false,
       // The filter avoids that private messages appear in the public stream.
-      // If you don't know what filters are in CouchDB, then read it up here:
-      // <a href="http://guide.couchdb.org/draft/notifications.html#filters">http://guide.couchdb.org/draft/notifications.html#filters</a>
-      // Look up how the filter works in `chat_example/filters/private_messages.js`.
       filter : Backbone.couch_connector.config.ddoc_name + "/private_messages"
     },
     
@@ -76,7 +77,7 @@ $(function(){
   });
   
   var PrivateMessages = new PrivateMessageList();
-  
+
   // Displays the current user's name and the message input field.
   var InputView = Backbone.View.extend({
     el : $('#input'),
@@ -136,16 +137,34 @@ $(function(){
     
     template : _.template($("#entry-template").html()),
     
+    events : {
+      "click .delete" : "delete_me"
+    },
+    
     // If there's a change in our model, rerender it
     initialize : function(){
-      _.bindAll(this, 'render');
+      _.bindAll(this, 'render', 'delete_me', 'delete_row');
       this.model.bind('change', this.render);
+      this.model.bind('remove', this.delete_row);
     },
     
     render : function(){ 
       var content = this.model.toJSON();
       $(this.el).html(this.template(content));
       return this;
+    },
+    
+    delete_me : function(){
+      if(CurrentUser.get('name') == this.model.get('from')){
+        this.model.destroy();
+        this.delete_row(); 
+      }else{
+        alert("You can only delete your own messages!");
+      }
+    },
+    
+    delete_row : function(){
+      $(this.el).remove();
     }
   });
   
@@ -258,12 +277,9 @@ $(function(){
     }
   });
 
-  var UserList = new UserListCollection();
-
   // The App router initializes the app by calling `UserList.fetch()`
   var App = Backbone.Router.extend({
     initialize : function(){
-      console.log("start");
       UserList.fetch();
     }
   });
@@ -312,6 +328,6 @@ $(function(){
     new MessagesList();
     new UserListView();
     new App();
-    
+
   }, 100);
 });
\ No newline at end of file
diff --git a/chat_example/_attachments/style/main.css b/chat_example/_attachments/style/main.css
index 66d8b54..eb38cb1 100644
--- a/chat_example/_attachments/style/main.css
+++ b/chat_example/_attachments/style/main.css
@@ -114,4 +114,16 @@ li.user {
 #message {
   width: 200px;
   height: 1.5em;
+}
+
+span.delete{
+  opacity: 0;
+  padding: 2px;
+  margin-left: 10px;
+}
+
+span.delete:hover{
+  opacity: 1;
+  color: #ffffff;
+  background: #000000;
 }
\ No newline at end of file
diff --git a/chat_example/filters/messages.js b/chat_example/filters/messages.js
index 50f56a2..1538735 100644
--- a/chat_example/filters/messages.js
+++ b/chat_example/filters/messages.js
@@ -1,5 +1,6 @@
 function(doc) {
-  if (doc.collection == "messages")
+  // IMPORTANT: in order to retrieve remove events, you should add "doc._deleted" to the filter
+  if (doc.collection == "messages" || doc._deleted)
     return true;
   else
     return false;