print message id of if a message causes a problem

1 files changed, 4 insertions, 2 deletions

diff --git a/protocol.cc b/protocol.cc
index 35580cb..91859da 100644
--- a/protocol.cc
+++ b/protocol.cc
@@ -789,8 +789,10 @@ muchsync_server(sqlite3 *db, notmuch_db &nm)
 	  }
 	}
 	catch (exception &e) {
-	  cerr << e.what() << '\n';
-	  cout << "550 " << e.what() << '\n';
+	  string msg (e.what());
+	  msg += " [id:" + hi.message_id + "]\n";
+	  cerr << msg;
+	  cout << "550 " << msg;
 	}
 	unlink(path.c_str());
       }