app/models/agents/imap_folder_agent.rb

@@ -228,8 +228,6 @@ module Agents

                 
              

                         next if (uids = seen[mail.uidvalidity]) && uids.include?(mail.uid)
              

                 
              

                -        next if notified.include?(mail.message_id)
              

                -
              

                         body_parts = mail.body_parts(mime_types)
              

                         matched_part = nil
              

                         matches = {}
              
@@ -275,35 +273,37 @@ module Agents

                           end
              

                         } or next
              

                 
              

                -        matched_part ||= body_parts.first
              

                +        unless notified.include?(mail.message_id)
              

                +          matched_part ||= body_parts.first
              

                 
              

                -        if matched_part
              

                -          mime_type = matched_part.mime_type
              

                -          body = matched_part.decoded
              

                -        else
              

                -          mime_type = 'text/plain'
              

                -          body = ''
              

                -        end
              

                +          if matched_part
              

                +            mime_type = matched_part.mime_type
              

                +            body = matched_part.decoded
              

                +          else
              

                +            mime_type = 'text/plain'
              

                +            body = ''
              

                +          end
              

                 
              

                -        create_event :payload => {
              

                -          'folder' => mail.folder,
              

                -          'subject' => mail.subject,
              

                -          'from' => mail.from_addrs.first,
              

                -          'to' => mail.to_addrs,
              

                -          'cc' => mail.cc_addrs,
              

                -          'date' => (mail.date.iso8601 rescue nil),
              

                -          'mime_type' => mime_type,
              

                -          'body' => body,
              

                -          'matches' => matches,
              

                -          'has_attachment' => mail.has_attachment?,
              

                -        }
              

                +          create_event :payload => {
              

                +            'folder' => mail.folder,
              

                +            'subject' => mail.subject,
              

                +            'from' => mail.from_addrs.first,
              

                +            'to' => mail.to_addrs,
              

                +            'cc' => mail.cc_addrs,
              

                +            'date' => (mail.date.iso8601 rescue nil),
              

                +            'mime_type' => mime_type,
              

                +            'body' => body,
              

                +            'matches' => matches,
              

                +            'has_attachment' => mail.has_attachment?,
              

                +          }
              

                +
              

                +          notified << mail.message_id if mail.message_id
              

                +        end
              

                 
              

                         if options['mark_as_read']
              

                           log 'Marking as read'
              

                           mail.mark_as_read
              

                         end
              

                -
              

                -        notified << mail.message_id if mail.message_id
              

                       }
              

                 
              

                       notified.slice!(0...-IDCACHE_SIZE) if notified.size > IDCACHE_SIZE
              

spec/models/agents/imap_folder_agent_spec.rb

@@ -228,6 +228,15 @@ describe Agents::ImapFolderAgent do

                         }
              

                         lambda { @checker.check }.should change { Event.count }.by(2)
              

                       end
              

                +
              

                +      it 'should create just one event for multiple mails with the same Message-Id' do
              

                +        @mails.first.message_id = @mails.last.message_id
              

                +        @checker.options['mark_as_read'] = true
              

                +        @mails.each { |mail|
              

                +          stub(mail).mark_as_read.once
              

                +        }
              

                +        lambda { @checker.check }.should change { Event.count }.by(1)
              

                +      end
              

                     end
              

                   end
              

                 end