diff --git a/src/if_xcmdsrv.c b/src/if_xcmdsrv.c
index cf6d9a77ae..b1fbdaa35d 100644
--- a/src/if_xcmdsrv.c
+++ b/src/if_xcmdsrv.c
@@ -1235,9 +1235,9 @@ server_parse_messages()
     while (head.next != NULL && head.next != &head)
     {
 	node = head.next;
-	server_parse_message(X_DISPLAY, node->propInfo, node->len);
 	head.next = node->next;
 	node->next->prev = node->prev;
+	server_parse_message(X_DISPLAY, node->propInfo, node->len);
 	vim_free(node);
     }
 }
diff --git a/src/version.c b/src/version.c
index 83bfe2b08e..71e1a2a8fd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    897,
 /**/
     896,
 /**/