Use Message-Id instead of X-CacheIndex

1 files changed, 6 insertions, 3 deletions

diff --git a/lib/feed2imap/feed2imap.rb b/lib/feed2imap/feed2imap.rb
index 3627ab0..fb8fb12 100644
--- a/lib/feed2imap/feed2imap.rb
+++ b/lib/feed2imap/feed2imap.rb
@@ -234,14 +234,17 @@ class Feed2Imap
       @logger.info("#{f.name}: #{newitems.length} new items, #{updateditems.length} updated items.") if newitems.length > 0 or updateditems.length > 0 or @logger.level == Logger::DEBUG
       begin
         if !cacherebuild
+          fn = f.name.gsub(/[^0-9A-Za-z]/,'')
           updateditems.each do |i|
-            email = item_to_mail(i, i.cacheditem.index, true, f.name, f.include_images, f.wrapto)
+            id = "<#{fn}-#{i.cacheditem.index}@acme.com>"
+            email = item_to_mail(i, id, true, f.name, f.include_images, f.wrapto)
             f.imapaccount.updatemail(f.folder, email,
-                                     i.cacheditem.index, i.date || Time::new)
+                                     id, i.date || Time::new)
           end
           # reverse is needed to upload older items first (fixes gna#8986)
           newitems.reverse.each do |i|
-            email = item_to_mail(i, i.cacheditem.index, false, f.name, f.include_images, f.wrapto)
+            id = "<#{fn}-#{i.cacheditem.index}@acme.com>"
+            email = item_to_mail(i, id, false, f.name, f.include_images, f.wrapto)
             f.imapaccount.putmail(f.folder, email, i.date || Time::new)
           end
         end