From ce5f3f38092be8e846dc4c194c889f717830ff4f Mon Sep 17 00:00:00 2001
From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Mon, 14 Oct 2013 01:19:05 -0500
Subject: [PATCH] vim: generate custom message-id

Using Mail as a reference.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 vim/notmuch.vim | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/vim/notmuch.vim b/vim/notmuch.vim
index 4bd5f131..64038eb5 100644
--- a/vim/notmuch.vim
+++ b/vim/notmuch.vim
@@ -421,6 +421,7 @@ ruby << EOF
 	require 'notmuch'
 	require 'rubygems'
 	require 'tempfile'
+	require 'socket'
 	begin
 		require 'mail'
 	rescue LoadError
@@ -492,6 +493,14 @@ ruby << EOF
 		end
 	end
 
+	def generate_message_id
+		t = Time.now
+		random_tag = sprintf('%x%x_%x%x%x',
+			t.to_i, t.tv_usec,
+			$$, Thread.current.object_id.abs, rand(255))
+		return "<#{random_tag}@#{Socket.gethostname}.notmuch>"
+	end
+
 	def open_reply(orig)
 		help_lines = [
 			'Notmuch-Help: Type in your message here; to help you use these bindings:',
@@ -505,6 +514,7 @@ ruby << EOF
 			end
 			m.cc = orig[:cc]
 			m.from = $email
+			m.message_id = generate_message_id
 			m.charset = 'utf-8'
 			m.content_transfer_encoding = '7bit'
 		end
-- 
2.43.0