diff --git a/meshms_restful.c b/meshms_restful.c
index 07c60e44..7b57be98 100644
--- a/meshms_restful.c
+++ b/meshms_restful.c
@@ -366,6 +366,7 @@ static int restful_meshms_messagelist_json_content_chunk(struct http_request *hr
     "text",
     "delivered",
     "read",
+    "timestamp",
     "ack_offset"
   };
   switch (r->u.msglist.phase) {
@@ -393,17 +394,18 @@ static int restful_meshms_messagelist_json_content_chunk(struct http_request *hr
 	if (   r->u.msglist.finished
 	    || (r->u.msglist.token_which_ply == r->u.msglist.iter.which_ply && r->u.msglist.iter.offset <= r->u.msglist.token_offset)
 	) {
-	    time_ms_t now;
-	    if (r->u.msglist.end_time && (now = gettime_ms()) < r->u.msglist.end_time) {
-	      r->u.msglist.token_which_ply = r->u.msglist.latest_which_ply;
-	      r->u.msglist.token_offset = r->u.msglist.latest_offset;
-	      meshms_message_iterator_close(&r->u.msglist.iter);
-	      time_ms_t wake_at = now + config.api.restful.newsince_poll_ms;
-	      if (wake_at > r->u.msglist.end_time)
-		wake_at = r->u.msglist.end_time;
-	      http_request_pause_response(&r->http, wake_at);
-	      return 0;
-	    }
+	  time_ms_t now;
+	  if (r->u.msglist.end_time && (now = gettime_ms()) < r->u.msglist.end_time) {
+	    r->u.msglist.token_which_ply = r->u.msglist.latest_which_ply;
+	    r->u.msglist.token_offset = r->u.msglist.latest_offset;
+	    meshms_message_iterator_close(&r->u.msglist.iter);
+	    time_ms_t wake_at = now + config.api.restful.newsince_poll_ms;
+	    if (wake_at > r->u.msglist.end_time)
+	      wake_at = r->u.msglist.end_time;
+	    http_request_pause_response(&r->http, wake_at);
+	    return 0;
+	  }
+	  r->u.msglist.phase = LIST_END;
 	} else {
 	  switch (r->u.msglist.iter.type) {
 	    case MESSAGE_SENT:
@@ -426,6 +428,8 @@ static int restful_meshms_messagelist_json_content_chunk(struct http_request *hr
 	      strbuf_putc(b, ',');
 	      strbuf_json_boolean(b, 0);
 	      strbuf_putc(b, ',');
+	      strbuf_sprintf(b, "%d", r->u.msglist.iter.timestamp);
+	      strbuf_putc(b, ',');
 	      strbuf_json_null(b);
 	      strbuf_puts(b, "]");
 	      break;
@@ -449,6 +453,8 @@ static int restful_meshms_messagelist_json_content_chunk(struct http_request *hr
 	      strbuf_putc(b, ',');
 	      strbuf_json_boolean(b, r->u.msglist.iter.read);
 	      strbuf_putc(b, ',');
+	      strbuf_sprintf(b, "%d", r->u.msglist.iter.timestamp);
+	      strbuf_putc(b, ',');
 	      strbuf_json_null(b);
 	      strbuf_puts(b, "]");
 	      break;
@@ -474,6 +480,8 @@ static int restful_meshms_messagelist_json_content_chunk(struct http_request *hr
 		strbuf_putc(b, ',');
 		strbuf_json_boolean(b, r->u.msglist.iter.read);
 		strbuf_putc(b, ',');
+		strbuf_sprintf(b, "%d", r->u.msglist.iter.timestamp);
+		strbuf_putc(b, ',');
 		strbuf_sprintf(b, "%"PRIu64, r->u.msglist.iter.ack_offset);
 		strbuf_puts(b, "]");
 		r->u.msglist.highest_ack_offset = r->u.msglist.iter.ack_offset;
diff --git a/tests/meshmsrestful b/tests/meshmsrestful
index 47047e09..fe183755 100755
--- a/tests/meshmsrestful
+++ b/tests/meshmsrestful
@@ -372,7 +372,7 @@ test_MeshmsListMessagesNewSinceArrival() {
    wait_until [ -e newsince1.json -a -e newsince2.json -a -e newsince3.json ]
    for message in '>Rumplestiltskin' 'A' '<Howdydoody' '>Eulenspiegel'; do
       meshms_add_messages $SIDA1 $SIDA2 "${message:0:1}" "${message:1}"
-      wait_until --timeout=60 grepall "${message:1}" newsince{1,2,3}.json
+      wait_until --timeout=10 grepall "${message:1}" newsince{1,2,3}.json
    done
    fork_terminate_all
    fork_wait_all