diff --git a/matrix-util.js b/matrix-util.js
index a455a7e..f163964 100644
--- a/matrix-util.js
+++ b/matrix-util.js
@@ -177,6 +177,8 @@ MatrixUtil.prototype._updateLastMessage = function(partner, msg, direction) {
         }
     }
 
+    matrix.buddies[partner]['waiting_for_response'] = (direction == 'outgoing');
+
     matrix.buddies[partner]['last_' + direction] = {
         msg: msg,
         last_update: moment().format(momentFormat),