--- a/mailnews/news/src/nsNNTPArticleList.cpp
+++ b/mailnews/news/src/nsNNTPArticleList.cpp
@@ -84,17 +84,17 @@ nsNNTPArticleList::AddArticleKey(nsMsgKe
 NS_IMETHODIMP
 nsNNTPArticleList::FinishAddingArticleKeys()
 {
   // if the last n messages in the group are cancelled, they won't have gotten removed
   // so we have to go and remove them now.
   if (m_dbIndex < m_idsInDB.Length())
     m_idsDeleted.AppendElements(&m_idsInDB[m_dbIndex],
       m_idsInDB.Length() - m_dbIndex);
-  
+
   if (m_idsDeleted.Length())
     m_newsFolder->RemoveMessages(m_idsDeleted);
 
 #ifdef DEBUG
   // make sure none of the deleted turned up on the idsOnServer list
   for (uint32_t i = 0; i < m_idsDeleted.Length(); i++) {
     NS_ASSERTION(!m_idsOnServer.Contains((nsMsgKey)m_idsDeleted[i]),
       "a deleted turned up on the idsOnServer list");

--- a/mailnews/news/src/nsNNTPNewsgroupList.cpp
+++ b/mailnews/news/src/nsNNTPNewsgroupList.cpp
@@ -536,17 +536,17 @@ nsNNTPNewsgroupList::ParseLine(char *lin
     uint32_t subjectLen = strlen(line);
 
     uint32_t flags = 0;
     // ### should call IsHeaderRead here...
     /* strip "Re: " */
     nsCString modifiedSubject;
     if (NS_MsgStripRE(&subject, &subjectLen, getter_Copies(modifiedSubject)))
       (void) newMsgHdr->OrFlags(nsMsgMessageFlags::HasRe, &flags);
-    
+
     // this will make sure read flags agree with newsrc
     if (! (flags & nsMsgMessageFlags::Read))
       rv = newMsgHdr->OrFlags(nsMsgMessageFlags::New, &flags);
 
     rv = newMsgHdr->SetSubject(modifiedSubject.IsEmpty() ? subject : modifiedSubject.get());
 
     if (NS_FAILED(rv))
       return rv;
@@ -902,17 +902,17 @@ nsNNTPNewsgroupList::FinishXOVERLINE(int
 NS_IMETHODIMP
 nsNNTPNewsgroupList::InitXHDR(nsACString &header)
 {
   if (++m_currentXHDRIndex >= m_filterHeaders.Length())
     header.Truncate();
   else
     header.Assign(m_filterHeaders[m_currentXHDRIndex]);
   // Don't include these in our XHDR bouts, as they are already provided through
-  // XOVER. 
+  // XOVER.
   if (header.EqualsLiteral("message-id") ||
       header.EqualsLiteral("references"))
     return InitXHDR(header);
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsNNTPNewsgroupList::ProcessXHDRLine(const nsACString &line)
@@ -1014,24 +1014,24 @@ nsNNTPNewsgroupList::ProcessHEADLine(con
   {
     m_thisLine += header; // Preserve whitespace (should we?)
     return NS_OK;
   }
   else
   {
     return NS_OK; // We are malformed. Just ignore and hope for the best...
   }
-  
+
   nsresult rv;
   if (!m_lastHeader.IsEmpty())
   {
     rv = AddHeader(m_lastHeader.get(), m_thisLine.get());
     NS_ENSURE_SUCCESS(rv,rv);
   }
-  
+
   value.Trim(" ");
 
   ToLowerCase(header, m_lastHeader);
   m_thisLine.Assign(value);
   return NS_OK;
 }
 
 nsresult
@@ -1092,17 +1092,17 @@ nsNNTPNewsgroupList::AddHeader(const cha
   return rv;
 }
 
 nsresult
 nsNNTPNewsgroupList::CallFilters()
 {
   nsresult rv;
   nsCString filterString;
-  
+
   nsCOMPtr <nsIMsgFolder> folder = do_QueryInterface(m_newsFolder, &rv);
   NS_ENSURE_SUCCESS(rv,rv);
 
   uint32_t filterCount = 0;
   if (m_filterList)
   {
     rv = m_filterList->GetFilterCount(&filterCount);
     NS_ENSURE_SUCCESS(rv,rv);
@@ -1262,17 +1262,17 @@ nsNNTPNewsgroupList::SetProgressStatus(c
 }
 
 void
 nsNNTPNewsgroupList::UpdateStatus(bool filtering, int32_t numDLed, int32_t totToDL)
 {
   int32_t numerator = (filtering ? m_currentXHDRIndex + 1 : 1) * numDLed;
   int32_t denominator = (m_filterHeaders.Length() + 1) * totToDL;
   int32_t percent = numerator * 100 / denominator;
-  
+
   nsAutoString numDownloadedStr;
   numDownloadedStr.AppendInt(numDLed);
 
   nsAutoString totalToDownloadStr;
   totalToDownloadStr.AppendInt(totToDL);
 
   nsAutoString newsgroupName;
   nsresult rv = m_newsFolder->GetUnicodeName(newsgroupName);

--- a/mailnews/news/src/nsNNTPNewsgroupList.h
+++ b/mailnews/news/src/nsNNTPNewsgroupList.h
@@ -57,17 +57,17 @@ public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSINNTPNEWSGROUPLIST
   NS_DECL_NSIMSGFILTERHITNOTIFY
 
 private:
   virtual  ~nsNNTPNewsgroupList();
 
   nsresult CleanUp();
-     
+
   bool    m_finishingXover;
 
 #ifdef HAVE_CHANGELISTENER
   virtual void OnAnnouncerGoingAway (ChangeAnnouncer *instigator);
 #endif
   nsresult ParseLine(char *line, uint32_t *message_number);
   nsresult GetDatabase(const char *uri, nsIMsgDatabase **db);
   void SetProgressBarPercent(int32_t percent);
@@ -82,30 +82,30 @@ protected:
   bool m_downloadAll;
   int32_t m_maxArticles;
   int32_t m_lastPercent;
   PRTime m_lastStatusUpdate;
 
   nsCOMPtr <nsIMsgNewsFolder> m_newsFolder;
   nsCOMPtr <nsIMsgDatabase> m_newsDB;
   nsCOMPtr <nsINntpUrl> m_runningURL;
- 
+
   /**
    * The last message that we have processed (XOVER or HEAD).
    */
   nsMsgKey m_lastProcessedNumber;
   /**
    * The endpoints of the message chunk we are actually downloading.
    */
   nsMsgKey m_firstMsgNumber, m_lastMsgNumber;
   /**
    * The endpoints of the message chunk we are capable of downloading.
    */
   int32_t m_firstMsgToDownload, m_lastMsgToDownload;
-  
+
   struct MSG_NewsKnown m_knownArts;
   nsMsgKeySet *m_set;
 
   nsTArray<nsCString> m_filterHeaders;
   uint32_t m_currentXHDRIndex;
   nsCString m_lastHeader;
   nsCString m_thisLine;
 
@@ -114,11 +114,11 @@ private:
   nsCOMPtr <nsIMsgFilterList> m_filterList;
   nsCOMPtr <nsIMsgFilterList> m_serverFilterList;
   nsCOMPtr <nsIMsgDBHdr> m_newMsgHdr; // current message header we're building
   nsCOMArray<nsIMsgDBHdr> m_newHeaders;
 
   bool m_addHdrToDB;
 
 };
-    
+
 #endif /* nsNNTPNewsgroupListState_h___ */
 

--- a/mailnews/news/src/nsNNTPNewsgroupPost.cpp
+++ b/mailnews/news/src/nsNNTPNewsgroupPost.cpp
@@ -80,15 +80,15 @@ nsNNTPNewsgroupPost::AddNewsgroup(const 
 // the file name to post...
 nsresult
 nsNNTPNewsgroupPost::SetPostMessageFile(nsIFile * aPostMessageFile)
 {
   m_postMessageFile = aPostMessageFile;
   return NS_OK;
 }
 
-nsresult 
+nsresult
 nsNNTPNewsgroupPost::GetPostMessageFile(nsIFile ** aPostMessageFile)
 {
   if (aPostMessageFile)
     NS_IF_ADDREF(*aPostMessageFile = m_postMessageFile);
   return NS_OK;
 }

--- a/mailnews/news/src/nsNNTPNewsgroupPost.h
+++ b/mailnews/news/src/nsNNTPNewsgroupPost.h
@@ -37,23 +37,23 @@
 #define IDX_HEADER_RELAYVERSION     14
 #define IDX_HEADER_POSTINGVERSION   15
 #define IDX_HEADER_MESSAGEID        16
 
 // keep this in sync with the above
 #define HEADER_LAST                 IDX_HEADER_MESSAGEID
 
 class nsNNTPNewsgroupPost : public nsINNTPNewsgroupPost {
-    
+
 public:
     nsNNTPNewsgroupPost();
-    
+
     NS_DECL_ISUPPORTS
     NS_DECL_NSINNTPNEWSGROUPPOST
-    
+
 private:
     virtual ~nsNNTPNewsgroupPost();
 
     nsCOMPtr<nsIFile> m_postMessageFile;
     nsCString m_header[HEADER_LAST+1];
     nsCString m_body;
     bool m_isControl;
 };

--- a/mailnews/news/src/nsNNTPProtocol.h
+++ b/mailnews/news/src/nsNNTPProtocol.h
@@ -362,17 +362,17 @@ private:
   nsresult PostDataResponse();
 
   nsresult CheckForArticle();
 
   /////////////////////////////////////////////////////////////////////////////
   // XHDR, XOVER, HEAD filtering process handlers
   // These are ordered by the rough order of usage
   /////////////////////////////////////////////////////////////////////////////
- 
+
   /**
    * The first step in the filtering process, the state NNTP_XOVER_BEGIN.
    * This method sets up m_newsgroupList.
    * Followed by: NNTP_FIGURE_NEXT_CHUNK
    */
   nsresult BeginReadXover();
   /**
    * The loop control for filtering, the state NNTP_FIGURE_NEXT_CHUNK.
@@ -423,24 +423,24 @@ private:
    */
   nsresult XhdrResponse(nsIInputStream *inputStream);
 
   // HEAD processing core
   /**
    * This state, NNTP_READ_GROUP, is the control for the HEAD processor.
    * It sends the HEAD command and increments the article number until it is
    * finished. WARNING: HEAD is REALLY SLOW.
-   * Followed by: NNTP_FIGURE_NEXT_CHUNK   when it is finished 
+   * Followed by: NNTP_FIGURE_NEXT_CHUNK   when it is finished
    *              NNTP_READ_GROUP_RESPONSE when it is not
    */
   nsresult ReadHeaders();
   /**
    * This state, NNTP_READ_GROUP_RESPONSE, checks if the article exists.
    * Because it is required by NNTP, if it doesn't work, the only problem would
-   * be that the article doesn't exist. Passes off article number data to 
+   * be that the article doesn't exist. Passes off article number data to
    * nsNNTPNewsgroupList.
    * Followed by: NNTP_READ_GROUP_BODY     if the article exists
    *              NNTP_READ_GROUP          if it doesn't.
    */
   nsresult ReadNewsgroupResponse();
   /**
    * This state, NNTP_READ_GROUP_BODY, reads the body of the HEAD command.
    * Once again, it passes information off to nsNNTPNewsgroupList.

--- a/mailnews/news/src/nsNewsDownloadDialogArgs.cpp
+++ b/mailnews/news/src/nsNewsDownloadDialogArgs.cpp
@@ -17,24 +17,24 @@ nsNewsDownloadDialogArgs::~nsNewsDownloa
 {
 }
 
 NS_IMPL_ISUPPORTS(nsNewsDownloadDialogArgs, nsINewsDownloadDialogArgs)
 
 NS_IMETHODIMP nsNewsDownloadDialogArgs::GetGroupName(nsAString & aGroupName)
  {
     aGroupName = mGroupName;
- 
+
     return NS_OK;
  }
 NS_IMETHODIMP nsNewsDownloadDialogArgs::SetGroupName(const nsAString & aGroupName)
  {
- 
+
      mGroupName = aGroupName;
- 
+
      return NS_OK;
  }
 NS_IMETHODIMP nsNewsDownloadDialogArgs::GetArticleCount(int32_t *aArticleCount)
 {
     NS_ENSURE_ARG_POINTER(aArticleCount);
 
     *aArticleCount = mArticleCount;
 
@@ -44,32 +44,32 @@ NS_IMETHODIMP nsNewsDownloadDialogArgs::
 {
     mArticleCount = aArticleCount;
 
     return NS_OK;
 }
 NS_IMETHODIMP nsNewsDownloadDialogArgs::GetServerKey(char * *aServerKey)
 {
     NS_ENSURE_ARG_POINTER(aServerKey);
-    
+
     *aServerKey = ToNewCString(mServerKey);
     return NS_OK;
 }
 NS_IMETHODIMP nsNewsDownloadDialogArgs::SetServerKey(const char * aServerKey)
 {
     NS_ENSURE_ARG_POINTER(aServerKey);
 
     mServerKey = aServerKey;
 
     return NS_OK;
 }
 NS_IMETHODIMP nsNewsDownloadDialogArgs::GetHitOK(bool *aHitOK)
 {
     NS_ENSURE_ARG_POINTER(aHitOK);
-    
+
     *aHitOK = mHitOK;
 
     return NS_OK;
 }
 NS_IMETHODIMP nsNewsDownloadDialogArgs::SetHitOK(bool aHitOK)
 {
     mHitOK = aHitOK;
 

--- a/mailnews/news/src/nsNewsFolder.cpp
+++ b/mailnews/news/src/nsNewsFolder.cpp
@@ -824,18 +824,18 @@ nsMsgNewsFolder::DeleteMessages(nsIArray
     for (uint32_t i = 0; i < count && NS_SUCCEEDED(rv); i++)
     {
       nsCOMPtr<nsIMsgDBHdr> msgHdr = do_QueryElementAt(messages, i, &rv);
       if (msgHdr)
         rv = mDatabase->DeleteHeader(msgHdr, nullptr, true, true);
     }
     EnableNotifications(allMessageCountNotifications, true);
   }
- 
-  if (!isMove) 
+
+  if (!isMove)
     NotifyFolderEvent(NS_SUCCEEDED(rv) ? kDeleteOrMoveMsgCompleted :
       kDeleteOrMoveMsgFailed);
 
   (void) RefreshSizeOnDisk();
 
   return NS_OK;
 }
 
@@ -876,17 +876,17 @@ NS_IMETHODIMP nsMsgNewsFolder::CancelMes
   cancelURL += '/';
   cancelURL += escapedMessageID;
   cancelURL += "?cancel";
 
   nsCString messageURI;
   rv = GetUriForMsg(msgHdr, messageURI);
   NS_ENSURE_SUCCESS(rv,rv);
 
-  return nntpService->CancelMessage(cancelURL.get(), messageURI.get(), nullptr /* consumer */, nullptr, 
+  return nntpService->CancelMessage(cancelURL.get(), messageURI.get(), nullptr /* consumer */, nullptr,
                                     aMsgWindow, nullptr);
 }
 
 NS_IMETHODIMP nsMsgNewsFolder::GetNewMessages(nsIMsgWindow *aMsgWindow, nsIUrlListener *aListener)
 {
   return GetNewsMessages(aMsgWindow, false, aListener);
 }
 
@@ -1295,17 +1295,17 @@ nsMsgNewsFolder::GetAuthenticationCreden
       }
       else
       {
         mGroupUsername.Truncate();
         mGroupPassword.Truncate();
       }
     }
   }
-  
+
   *validCredentials = !(mGroupUsername.IsEmpty() || mGroupPassword.IsEmpty());
   return NS_OK;
 }
 
 NS_IMETHODIMP nsMsgNewsFolder::ForgetAuthenticationCredentials()
 {
   nsString signonUrl;
   nsresult rv = CreateNewsgroupUrlForSignon(nullptr, signonUrl);
@@ -1367,36 +1367,36 @@ NS_IMETHODIMP nsMsgNewsFolder::MoveFolde
     indexMin = indexNewsgroupToMove;
     indexMax = indexRefNewsgroup;
   }
   else
   {
     if (aOrientation > 0)
       indexRefNewsgroup++;
     indexMin = indexRefNewsgroup;
-    indexMax = indexNewsgroupToMove; 
+    indexMax = indexNewsgroupToMove;
   }
 
   // move NewsgroupToMove to new index and set new sort order
   NotifyItemRemoved(aNewsgroupToMove);
 
   if (indexNewsgroupToMove != indexRefNewsgroup)
   {
     nsCOMPtr<nsIMsgFolder> newsgroup = mSubFolders[indexNewsgroupToMove];
 
     mSubFolders.RemoveObjectAt(indexNewsgroupToMove);
 
     // indexRefNewsgroup is already set up correctly.
     mSubFolders.InsertObjectAt(newsgroup, indexRefNewsgroup);
   }
-  
+
   for (uint32_t i = indexMin; i <= indexMax; i++)
     mSubFolders[i]->SetSortOrder(kNewsSortOffset + i);
 
-  NotifyItemAdded(aNewsgroupToMove);  
+  NotifyItemAdded(aNewsgroupToMove);
 
   // write changes back to file
   nsCOMPtr<nsINntpIncomingServer> nntpServer;
   rv = GetNntpServer(getter_AddRefs(nntpServer));
   NS_ENSURE_SUCCESS(rv,rv);
 
   rv = nntpServer->SetNewsrcHasChanged(true);
   NS_ENSURE_SUCCESS(rv,rv);

--- a/mailnews/news/src/nsNewsFolder.h
+++ b/mailnews/news/src/nsNewsFolder.h
@@ -55,17 +55,17 @@ public:
 
   NS_IMETHOD GetSizeOnDisk(int64_t *size) override;
 
   NS_IMETHOD GetDBFolderInfoAndDB(nsIDBFolderInfo **folderInfo,
                                   nsIMsgDatabase **db) override;
 
   NS_IMETHOD DeleteMessages(nsIArray *messages,
                             nsIMsgWindow *msgWindow, bool deleteStorage,
-                            bool isMove, nsIMsgCopyServiceListener* listener, 
+                            bool isMove, nsIMsgCopyServiceListener* listener,
                             bool allowUndo) override;
   NS_IMETHOD GetNewMessages(nsIMsgWindow *aWindow,
                             nsIUrlListener *aListener) override;
 
   NS_IMETHOD GetCanSubscribe(bool *aResult) override;
   NS_IMETHOD GetCanFileMessages(bool *aResult) override;
   NS_IMETHOD GetCanCreateSubfolders(bool *aResult) override;
   NS_IMETHOD GetCanRename(bool *aResult) override;

--- a/mailnews/news/src/nsNntpIncomingServer.cpp
+++ b/mailnews/news/src/nsNntpIncomingServer.cpp
@@ -622,17 +622,17 @@ nsNntpIncomingServer::PrepareForNextUrl(
   {
     RefPtr<nsNntpMockChannel> channel = m_queuedChannels[0];
     m_queuedChannels.RemoveElementAt(0);
     nsresult rv = channel->AttachNNTPConnection(*aConnection);
     // If this succeeded, the connection is now running the URL.
     if (NS_SUCCEEDED(rv))
       return NS_OK;
   }
-  
+
   // No queued uris.
   return NS_OK;
 }
 
 /* void RemoveConnection (in nsINNTPProtocol aNntpConnection); */
 NS_IMETHODIMP nsNntpIncomingServer::RemoveConnection(nsINNTPProtocol *aNntpConnection)
 {
   if (aNntpConnection)

--- a/mailnews/news/src/nsNntpIncomingServer.h
+++ b/mailnews/news/src/nsNntpIncomingServer.h
@@ -31,17 +31,17 @@ class nsINntpUrl;
 class nsIMsgMailNewsUrl;
 
 /* get some implementation from nsMsgIncomingServer */
 class nsNntpIncomingServer : public nsMsgIncomingServer,
                              public nsINntpIncomingServer,
                              public nsIUrlListener,
                              public nsISubscribableServer,
                              public nsITreeView
-                             
+
 {
 public:
     NS_DECL_ISUPPORTS_INHERITED
     NS_DECL_NSINNTPINCOMINGSERVER
     NS_DECL_NSIURLLISTENER
     NS_DECL_NSISUBSCRIBABLESERVER
     NS_DECL_NSITREEVIEW
 
@@ -96,17 +96,17 @@ protected:
     void WriteLine(nsIOutputStream *stream, nsCString &str);
 
 private:
     nsTArray<nsCString> mSubscribedNewsgroups;
     nsTArray<nsCString> mGroupsOnServer;
     nsTArray<nsCString> mSubscribeSearchResult;
     bool mSearchResultSortDescending;
     // the list of of subscribed newsgroups within a given
-    // subscribed dialog session.  
+    // subscribed dialog session.
     // we need to keep track of them so we know what to show as "checked"
     // in the search view
     nsTArray<nsCString> mTempSubscribed;
 
     nsCOMPtr<nsITreeBoxObject> mTree;
     nsCOMPtr<nsITreeSelection> mTreeSelection;
 
     bool     mHasSeenBeginGroups;

--- a/mailnews/news/src/nsNntpService.cpp
+++ b/mailnews/news/src/nsNntpService.cpp
@@ -240,17 +240,17 @@ nsNntpService::DisplayMessage(const char
 
   i18nurl->SetCharsetOverRide(aCharsetOverride);
 
   bool shouldStoreMsgOffline = false;
 
   if (folder)
   {
     nsCOMPtr<nsIMsgIncomingServer> server;
-    // We need to set the port on the url, just like 
+    // We need to set the port on the url, just like
     // nsNNTPProtocol::Initialize does, so the specs will be the same.
     // we can ignore errors here - worst case, we'll display the
     // "message not available" message.
     rv = folder->GetServer(getter_AddRefs(server));
     NS_ENSURE_SUCCESS(rv, rv);
 
     int32_t port = 0;
     rv = url->GetPort(&port);
@@ -1193,17 +1193,17 @@ NS_IMETHODIMP nsNntpService::GetProtocol
 {
     NS_ENSURE_ARG_POINTER(aUritype);
     *aUritype = URI_NORELATIVE | URI_FORBIDS_AUTOMATIC_DOCUMENT_REPLACEMENT |
       URI_LOADABLE_BY_ANYONE | ALLOWS_PROXY | URI_FORBIDS_COOKIE_ACCESS
 #ifdef IS_ORIGIN_IS_FULL_SPEC_DEFINED
       | ORIGIN_IS_FULL_SPEC
 #endif
     ;
-  
+
     return NS_OK;
 }
 
 NS_IMETHODIMP nsNntpService::NewURI(const nsACString &aSpec,
                                     const char *aCharset, // ignored
                                     nsIURI *aBaseURI,
                                     nsIURI **_retval)
 {

--- a/mailnews/news/src/nsNntpUrl.cpp
+++ b/mailnews/news/src/nsNntpUrl.cpp
@@ -427,17 +427,17 @@ nsNntpUrl::SetOriginalSpec(const char *a
     mOriginalSpec = aSpec;
     return NS_OK;
 }
 
 NS_IMETHODIMP
 nsNntpUrl::GetServer(nsIMsgIncomingServer **aServer)
 {
   NS_ENSURE_ARG_POINTER(aServer);
-  
+
   nsresult rv;
   nsAutoCString scheme, user, host;
 
   GetScheme(scheme);
   GetUsername(user);
   GetHost(host);
 
   // No authority -> no server
@@ -449,20 +449,20 @@ nsNntpUrl::GetServer(nsIMsgIncomingServe
 
   // Looking up the server...
   // news-message is used purely internally, so it can never refer to the real
   // attribute. nntp is never used internally, so it probably refers to the real
   // one. news is used both internally and externally, so it could refer to
   // either one. We'll assume it's an internal one first, though.
   bool isNews = scheme.EqualsLiteral("news") || scheme.EqualsLiteral("snews");
   bool isNntp = scheme.EqualsLiteral("nntp") || scheme.EqualsLiteral("nntps");
-  
+
   bool tryReal = isNntp;
 
-  nsCOMPtr<nsIMsgAccountManager> accountManager = 
+  nsCOMPtr<nsIMsgAccountManager> accountManager =
     do_GetService(NS_MSGACCOUNTMANAGER_CONTRACTID, &rv);
   NS_ENSURE_SUCCESS(rv, rv);
 
   // Ignoring return results: it is perfectly acceptable for the server to not
   // exist, but FindServer (and not FindRealServer) throws NS_ERROR_UNEXPECTED
   // in this case.
   *aServer = nullptr;
   if (tryReal)