diff --git a/ChangeLog.txt b/ChangeLog.txt
index 10fdeaa4..1cb58adb 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,6 +1,9 @@
 Broker:
 - Fix possible crash when using pattern ACLs.
 
+Client library:
+- Inflight limits should only apply to outgoing messages. Closes #461620.
+
 
 1.4 - 20150218
 ==============
diff --git a/lib/messages_mosq.c b/lib/messages_mosq.c
index 7b9d9577..24598bbe 100644
--- a/lib/messages_mosq.c
+++ b/lib/messages_mosq.c
@@ -121,11 +121,11 @@ void _mosquitto_message_queue(struct mosquitto *mosq, struct mosquitto_message_a
 			mosq->out_messages = message;
 		}
 		mosq->out_messages_last = message;
-	}else{
-		mosq->in_queue_len++;
 		if(message->msg.qos > 0 && (mosq->max_inflight_messages == 0 || mosq->inflight_messages < mosq->max_inflight_messages)){
 			mosq->inflight_messages++;
 		}
+	}else{
+		mosq->in_queue_len++;
 		message->next = NULL;
 		if(mosq->in_messages_last){
 			mosq->in_messages_last->next = message;