diff --git a/src/Forms/FixCommonErrors.cs b/src/Forms/FixCommonErrors.cs
index 6c086cc03..9609a348e 100644
--- a/src/Forms/FixCommonErrors.cs
+++ b/src/Forms/FixCommonErrors.cs
@@ -554,7 +554,7 @@ namespace Nikse.SubtitleEdit.Forms
             int emptyLinesRemoved = 0;
 
             int firstNumber = _subtitle.Paragraphs[0].Number;
-
+            listViewFixes.BeginUpdate();
             for (int i = _subtitle.Paragraphs.Count - 1; i >= 0; i--)
             {
                 Paragraph p = _subtitle.Paragraphs[i];
@@ -601,6 +601,7 @@ namespace Nikse.SubtitleEdit.Forms
                 }
             }
 
+            listViewFixes.EndUpdate();
             if (emptyLinesRemoved > 0)
             {
                 LogStatus(_language.RemovedEmptyLinesUnsedLineBreaks, string.Format(_language.EmptyLinesRemovedX, emptyLinesRemoved));
@@ -1779,6 +1780,15 @@ namespace Nikse.SubtitleEdit.Forms
             for (int i = 0; i < _subtitle.Paragraphs.Count; i++)
             {
                 Paragraph p = _subtitle.Paragraphs[i];
+                if (!p.Text.Contains("\""))
+                    continue;
+                // Removes ' if like: "' or '"
+                while (p.Text.Contains("\"'") || p.Text.Contains("'\""))
+                {
+                    p.Text = p.Text.Replace("\"'", "\"");
+                    p.Text = p.Text.Replace("'\"", "\"");
+                }
+
                 if (Utilities.CountTagInText(p.Text, "\"") == 1)
                 {
                     Paragraph next = _subtitle.GetParagraphOrDefault(i + 1);
diff --git a/src/Forms/Main.cs b/src/Forms/Main.cs
index 2397516a6..c1548997a 100644
--- a/src/Forms/Main.cs
+++ b/src/Forms/Main.cs
@@ -19456,7 +19456,7 @@ namespace Nikse.SubtitleEdit.Forms
                     _timerCheckForUpdates.Stop();
             }
             catch
-            { 
+            {
             }
 
             var form = new CheckForUpdates(this);
diff --git a/src/Languages/pt-PT.xml b/src/Languages/pt-PT.xml
index 67d739428..09a552617 100644
--- a/src/Languages/pt-PT.xml
+++ b/src/Languages/pt-PT.xml
@@ -202,7 +202,7 @@ Email: mailto:nikse.dk@gmail.com</AboutText1>
     <CheckingForUpdatesNoneAvailable>Está a usar a última versão do Subtitle Edit :)</CheckingForUpdatesNoneAvailable>
     <CheckingForUpdatesNewVersion>Nova versão disponível!</CheckingForUpdatesNewVersion>
     <InstallUpdate>Ir para a página de transferência</InstallUpdate>
-  </CheckForUpdates>  
+  </CheckForUpdates>
   <ChooseAudioTrack>
     <Title>Escolher a faixa de áudio</Title>
   </ChooseAudioTrack>
@@ -830,7 +830,7 @@ Email: mailto:nikse.dk@gmail.com</AboutText1>
         <LeaveSession>Abandonar sessão</LeaveSession>
       </Networking>
       <Help>
-        <CheckForUpdates>Verificar se há atualizações...</CheckForUpdates>	  
+        <CheckForUpdates>Verificar se há atualizações...</CheckForUpdates>
         <Title>Ajuda</Title>
         <Help>&amp;Ajuda</Help>
         <About>&amp;Sobre</About>
@@ -1485,7 +1485,7 @@ editar o mesmo ficheiro de legenda (colaboração)</Information>
     <VideoEngine>Mecanismo de vídeo</VideoEngine>
     <DirectShow>DirectShow</DirectShow>
     <DirectShowDescription>quartz.dll na pasta system32</DirectShowDescription>
-    <DirectShowDescription64>quartz.dll na pasta SysWOW64</DirectShowDescription64>	
+    <DirectShowDescription64>quartz.dll na pasta SysWOW64</DirectShowDescription64>
     <ManagedDirectX>Gerado pelo DirectX</ManagedDirectX>
     <ManagedDirectXDescription>Microsoft.DirectX.AudioVideoPlayback - Código .NET gerado pelo DirectX</ManagedDirectXDescription>
     <MPlayer>MPlayer</MPlayer>
diff --git a/src/Logic/Forms/CheckForUpdatesHelper.cs b/src/Logic/Forms/CheckForUpdatesHelper.cs
index f3df086a2..56e045a18 100644
--- a/src/Logic/Forms/CheckForUpdatesHelper.cs
+++ b/src/Logic/Forms/CheckForUpdatesHelper.cs
@@ -18,9 +18,9 @@ namespace Nikse.SubtitleEdit.Logic.Forms
         private int _successCount;
 
         public string Error { get; set; }
-        public bool Done 
-        { 
-            get 
+        public bool Done
+        {
+            get
             {
                 return _successCount == 1;
             }
@@ -150,7 +150,7 @@ namespace Nikse.SubtitleEdit.Logic.Forms
 
         public void CheckForUpdates()
         {
-            // load github release json 
+            // load github release json
             //StartDownloadString(ReleasesUrl, "application/json", new AsyncCallback(FinishWebRequestReleases));
 
             // load change log
@@ -183,7 +183,7 @@ namespace Nikse.SubtitleEdit.Logic.Forms
             catch
             {
                 return false;
-            }            
+            }
 
         }
 
diff --git a/src/Logic/Language.cs b/src/Logic/Language.cs
index ea215aeee..41030a130 100644
--- a/src/Logic/Language.cs
+++ b/src/Logic/Language.cs
@@ -26,7 +26,7 @@ namespace Nikse.SubtitleEdit.Logic
         public LanguageStructure.ChangeCasingNames ChangeCasingNames;
         public LanguageStructure.ChangeFrameRate ChangeFrameRate;
         public LanguageStructure.ChangeSpeedInPercent ChangeSpeedInPercent;
-        public LanguageStructure.CheckForUpdates CheckForUpdates;        
+        public LanguageStructure.CheckForUpdates CheckForUpdates;
         public LanguageStructure.ChooseAudioTrack ChooseAudioTrack;
         public LanguageStructure.ChooseEncoding ChooseEncoding;
         public LanguageStructure.ChooseLanguage ChooseLanguage;
@@ -339,7 +339,7 @@ namespace Nikse.SubtitleEdit.Logic
                 CheckingForUpdatesNewVersion = "New version available!",
                 InstallUpdate = "Go to download page",
                 NoUpdates = "Don't update",
-            };            
+            };
 
             ChooseAudioTrack = new LanguageStructure.ChooseAudioTrack
             {
diff --git a/src/Logic/LanguageStructure.cs b/src/Logic/LanguageStructure.cs
index 958a91e37..300f1ff34 100644
--- a/src/Logic/LanguageStructure.cs
+++ b/src/Logic/LanguageStructure.cs
@@ -1179,7 +1179,7 @@
 
                 public class HelpMenu
                 {
-                    public string CheckForUpdates { get; set; }                    
+                    public string CheckForUpdates { get; set; }
                     public string Title { get; set; }
                     public string Help { get; set; }
                     public string About { get; set; }
@@ -1647,7 +1647,7 @@
             public string AutoBackupEveryMinute { get; set; }
             public string AutoBackupEveryFiveMinutes { get; set; }
             public string AutoBackupEveryFifteenMinutes { get; set; }
-            public string CheckForUpdates { get; set; }            
+            public string CheckForUpdates { get; set; }
             public string AllowEditOfOriginalSubtitle { get; set; }
             public string PromptDeleteLines { get; set; }
             public string TimeCodeMode { get; set; }