From b56534399262c53cd4c25787a9a85684e04fb168 Mon Sep 17 00:00:00 2001
From: "jefft%netscape.com"
 <jefft%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 16 Apr 2002 04:13:09 +0000
Subject: [PATCH] fixed bug 136476 -MDN:If you filter mesgs and receive a mesg
 that is requesting RR, you are prompted to send the RR before you actually
 click on the mesg; r=bienvenu, sr=sspitzer

git-svn-id: svn://10.0.0.236/trunk@119071 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../mailnews/imap/src/nsImapMailFolder.cpp    | 42 -------------------
 .../imap/src/nsImapServerResponseParser.cpp   |  2 +-
 2 files changed, 1 insertion(+), 43 deletions(-)

diff --git a/mozilla/mailnews/imap/src/nsImapMailFolder.cpp b/mozilla/mailnews/imap/src/nsImapMailFolder.cpp
index 22bc5c58fc6..5b03db2aab5 100644
--- a/mozilla/mailnews/imap/src/nsImapMailFolder.cpp
+++ b/mozilla/mailnews/imap/src/nsImapMailFolder.cpp
@@ -2849,42 +2849,6 @@ NS_IMETHODIMP nsImapMailFolder::ApplyFilterHit(nsIMsgFilter *filter, nsIMsgWindo
             msgHdr->SetFlags(msgFlags & ~MSG_FLAG_MDN_REPORT_NEEDED);
             msgHdr->OrFlags(MSG_FLAG_MDN_REPORT_SENT, &newFlags);
 
-            nsCOMPtr<nsIMsgMdnGenerator> mdnGenerator;
-            nsCOMPtr<nsIMimeHeaders> mimeHeaders;
-
-            mdnGenerator =
-                do_CreateInstance(NS_MSGMDNGENERATOR_CONTRACTID, &rv);
-            if (mdnGenerator)
-            {
-                mimeHeaders = do_CreateInstance(NS_IMIMEHEADERS_CONTRACTID,
-                                                &rv);
-                if (NS_SUCCEEDED(rv))
-            {
-                    char *headers;
-                    PRInt32 headersSize;
-                    rv = m_msgParser->GetAllHeaders(&headers,
-                                                    &headersSize);
-                    if (NS_SUCCEEDED(rv))
-                    {
-                        mimeHeaders->Initialize(headers, headersSize);
-                        nsMsgKey msgKey;
-                        msgHdr->GetMessageKey(&msgKey);
-                        
-                        if (actionType == nsMsgFilterAction::Delete)
-                        {
-                            mdnGenerator->Process(nsIMsgMdnGenerator::eDeleted,
-                                                  msgWindow, this, msgKey,
-                                                  mimeHeaders, PR_TRUE);
-            }
-            else
-            {
-                            mdnGenerator->Process(nsIMsgMdnGenerator::eProcessed,
-                                                  msgWindow, this, msgKey,
-                                                  mimeHeaders, PR_TRUE);
-                        }
-                    }
-                }
-            }
           }
           nsresult err = MoveIncorporatedMessage(msgHdr, mDatabase, actionTargetFolderUri, filter, msgWindow);
           if (NS_SUCCEEDED(err))
@@ -3495,12 +3459,6 @@ void nsImapMailFolder::TweakHeaderFlags(nsIImapProtocol* aProtocol, nsIMsgDBHdr
             tweakMe->AndFlags(~MSG_FLAG_MDN_REPORT_NEEDED, &dbHdrFlags);
         }
       }
-      else
-      {
-        if (!(imap_flags & kImapMsgRecentFlag) && 
-          dbHdrFlags & MSG_FLAG_MDN_REPORT_NEEDED)
-          tweakMe->AndFlags(~MSG_FLAG_MDN_REPORT_NEEDED, &dbHdrFlags);
-      }
 
       if (imap_flags & kImapMsgAnsweredFlag)
         newFlags |= MSG_FLAG_REPLIED;
diff --git a/mozilla/mailnews/imap/src/nsImapServerResponseParser.cpp b/mozilla/mailnews/imap/src/nsImapServerResponseParser.cpp
index 02a081661ae..2aa95c56615 100644
--- a/mozilla/mailnews/imap/src/nsImapServerResponseParser.cpp
+++ b/mozilla/mailnews/imap/src/nsImapServerResponseParser.cpp
@@ -1686,7 +1686,7 @@ void nsImapServerResponseParser::resp_text_code()
 				{
 					fSettablePermanentFlags |= kImapMsgDraftFlag;
 				}
-				else if (!PL_strncasecmp(fNextToken, "\\*)]", 4))
+				else if (!PL_strncasecmp(fNextToken, "\\*", 2))
 				{
 					 fSupportsUserDefinedFlags |= kImapMsgSupportUserFlag;
 					 fSupportsUserDefinedFlags |= kImapMsgSupportForwardedFlag;