diff --git a/src/clawPDF.Core/Actions/EMailClientAction.cs b/src/clawPDF.Core/Actions/EMailClientAction.cs
index 24910a35..0356ebfc 100644
--- a/src/clawPDF.Core/Actions/EMailClientAction.cs
+++ b/src/clawPDF.Core/Actions/EMailClientAction.cs
@@ -1,7 +1,15 @@
 using System;
+using System.Text.RegularExpressions;
+using iText.Kernel.Pdf.Canvas.Parser.Listener;
 using clawSoft.clawPDF.Core.Jobs;
 using clawSoft.clawPDF.Mail;
+using iText.Kernel.Pdf;
+using iText.Kernel.Pdf.Canvas.Parser;
 using NLog;
+using System.Collections.Generic;
+using PdfToSvg;
+using Org.BouncyCastle.Cms;
+using System.Linq;
 
 namespace clawSoft.clawPDF.Core.Actions
 {
@@ -36,9 +44,27 @@ public ActionResult ProcessJob(IJob job)
 
                 if (job.Profile.EmailClient.AddSignature) message.Body += _signatureText;
 
-                foreach (var recipient in job.Profile.EmailClient.Recipients.Replace(',', ';').Split(';'))
-                    if (!string.IsNullOrWhiteSpace(recipient))
-                        message.To.Add(recipient.Trim());
+                if (!job.Profile.EmailClient.Autodetect)
+                {
+                    foreach (var recipient in job.Profile.EmailClient.Recipients.Replace(',', ';').Split(';'))
+                        if (!string.IsNullOrWhiteSpace(recipient))
+                            message.To.Add(recipient.Trim());
+                }
+                else
+                {
+                    foreach (var file in job.OutputFiles)
+                    {
+                        if (file.Contains(".pdf"))
+                        {
+                            List<string> emails = ExtractEmailsFromPdf(file);
+                            List<string> distinctemails = emails.Distinct().ToList();
+                            foreach (string email in distinctemails)
+                            {
+                                message.To.Add(email.Trim());
+                            }
+                        }
+                    }
+                }
 
                 foreach (var file in job.OutputFiles) message.Attachments.Add(new Attachment(file));
 
@@ -70,6 +96,33 @@ public ActionResult ProcessJob(IJob job)
             }
         }
 
+        public static List<string> ExtractEmailsFromPdf(string pdfPath)
+        {
+            var emails = new List<string>();
+
+            using (PdfReader reader = new PdfReader(pdfPath))
+            {
+                using (iText.Kernel.Pdf.PdfDocument pdfDocument = new iText.Kernel.Pdf.PdfDocument(reader))
+                {
+                    var pageCount = pdfDocument.GetNumberOfPages();
+                    var regexPattern = new Regex(@"\b[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Z|a-z]{2,}\b");
+
+                    for (int i = 1; i <= pageCount; i++)
+                    {
+                        var pageContent = PdfTextExtractor.GetTextFromPage(pdfDocument.GetPage(i), new SimpleTextExtractionStrategy());
+                        var matches = regexPattern.Matches(pageContent);
+
+                        foreach (Match match in matches)
+                        {
+                            emails.Add(match.Value);
+                        }
+                    }
+                }
+            }
+
+            return emails;
+        }
+
         public static bool CheckEmailClientInstalled()
         {
             var emailClientFactory = new EmailClientFactory();
diff --git a/src/clawPDF.Settings/EmailClient.cs b/src/clawPDF.Settings/EmailClient.cs
index a9906a9a..50d39538 100644
--- a/src/clawPDF.Settings/EmailClient.cs
+++ b/src/clawPDF.Settings/EmailClient.cs
@@ -42,6 +42,11 @@ public EmailClient()
         /// </summary>
         public string Recipients { get; set; }
 
+        /// <summary>
+        ///     Automatic detection of email(s) in the PDF document
+        /// </summary>
+        public bool Autodetect { get; set; }
+
         /// <summary>
         ///     Subject line of the E-mail
         /// </summary>
@@ -94,6 +99,15 @@ public void ReadValues(Data data, string path)
                 Recipients = "";
             }
 
+            try
+            {
+                Autodetect = bool.Parse(data.GetValue(@"" + path + @"Autodetect"));
+            }
+            catch
+            {
+                Autodetect = true;
+            }
+
             try
             {
                 Subject = Data.UnescapeString(data.GetValue(@"" + path + @"Subject"));
@@ -110,6 +124,7 @@ public void StoreValues(Data data, string path)
             data.SetValue(@"" + path + @"Content", Data.EscapeString(Content));
             data.SetValue(@"" + path + @"Enabled", Enabled.ToString());
             data.SetValue(@"" + path + @"Recipients", Data.EscapeString(Recipients));
+            data.SetValue(@"" + path + @"Autodetect", Autodetect.ToString());
             data.SetValue(@"" + path + @"Subject", Data.EscapeString(Subject));
         }
 
@@ -121,6 +136,7 @@ public EmailClient Copy()
             copy.Content = Content;
             copy.Enabled = Enabled;
             copy.Recipients = Recipients;
+            copy.Autodetect = Autodetect;
             copy.Subject = Subject;
 
             return copy;
@@ -135,6 +151,7 @@ public override bool Equals(object o)
             if (!Content.Equals(v.Content)) return false;
             if (!Enabled.Equals(v.Enabled)) return false;
             if (!Recipients.Equals(v.Recipients)) return false;
+            if (!Autodetect.Equals(v.Autodetect)) return false;
             if (!Subject.Equals(v.Subject)) return false;
 
             return true;
@@ -148,6 +165,7 @@ public override string ToString()
             sb.AppendLine("Content=" + Content);
             sb.AppendLine("Enabled=" + Enabled);
             sb.AppendLine("Recipients=" + Recipients);
+            sb.AppendLine("Autodetect=" + Autodetect);
             sb.AppendLine("Subject=" + Subject);
 
             return sb.ToString();
diff --git a/src/clawPDF/Views/ActionControls/EmailClientActionControl.xaml b/src/clawPDF/Views/ActionControls/EmailClientActionControl.xaml
index c1380368..e7ef5634 100644
--- a/src/clawPDF/Views/ActionControls/EmailClientActionControl.xaml
+++ b/src/clawPDF/Views/ActionControls/EmailClientActionControl.xaml
@@ -10,6 +10,10 @@
         <Label>
             <TextBlock Name="RecipientsText">Recipients:</TextBlock>
         </Label>
+        <CheckBox Name="EmailAutoDetect"
+                                  IsChecked="{Binding CurrentProfile.EmailClient.Autodetect}" Checked="EmailAutoDetect_Checked" Unchecked="EmailAutoDetect_Unchecked">
+            Automatic recognition
+        </CheckBox>
         <TextBox Name="RecipientsTextBox" Text="{Binding CurrentProfile.EmailClient.Recipients}" Height="24" Foreground="{StaticResource ControlDefaultForeground}" Background="{StaticResource ContainerBackground}" />
         <Label>
             <TextBlock Name="MultipleRecipientsHintText" Margin="0 -3 0 0" TextWrapping="Wrap">Multiple recipients are separated by commas</TextBlock>
diff --git a/src/clawPDF/Views/ActionControls/EmailClientActionControl.xaml.cs b/src/clawPDF/Views/ActionControls/EmailClientActionControl.xaml.cs
index c00fb2bf..87b52221 100644
--- a/src/clawPDF/Views/ActionControls/EmailClientActionControl.xaml.cs
+++ b/src/clawPDF/Views/ActionControls/EmailClientActionControl.xaml.cs
@@ -25,6 +25,8 @@ public EmailClientActionControl()
                 "Description",
                 "Opens a new e-mail in the default client. There you can add receipients, text and other information and then send the mail to your contacts.");
             TranslationHelper.Instance.TranslatorInstance.Translate(this);
+
+            // if (CurrentProfile.EmailClient.Autodetect) RecipientsTextBox.IsEnabled = false;
         }
 
         public override bool IsActionEnabled
@@ -99,5 +101,15 @@ private void EditEmailTextButton_OnClick(object sender, RoutedEventArgs e)
                 EmailClientSettings.AddSignature = setEmailTextForm.AddSignature;
             }
         }
+
+        private void EmailAutoDetect_Checked(object sender, RoutedEventArgs e)
+        {
+            RecipientsTextBox.IsEnabled = false;
+        }
+
+        private void EmailAutoDetect_Unchecked(object sender, RoutedEventArgs e)
+        {
+            RecipientsTextBox.IsEnabled = true;
+        }
     }
 }
\ No newline at end of file
diff --git a/src/clawPDF/languages/Catalan (Catalan).ini b/src/clawPDF/languages/Catalan (Catalan).ini
index 2b77bdbb..3643f867 100644
--- a/src/clawPDF/languages/Catalan (Catalan).ini	
+++ b/src/clawPDF/languages/Catalan (Catalan).ini	
@@ -167,6 +167,7 @@ CheckMailClientButtonText.Text=Verifica el client de correu
 EditEmailButtonText.Text=Edita el text del missatge
 MultipleRecipientsHintText.Text=Múltiples destinataris separats per comes
 RecipientsText.Text=Destinataris:
+EmailAutoDetect.Content=Reconeixement automàtic
 
 [EmailClientActionSettings]
 CheckMailClient=Verifica el client de correu.
diff --git a/src/clawPDF/languages/Catalan (Valencian).ini b/src/clawPDF/languages/Catalan (Valencian).ini
index e129404a..4476d041 100644
--- a/src/clawPDF/languages/Catalan (Valencian).ini	
+++ b/src/clawPDF/languages/Catalan (Valencian).ini	
@@ -167,6 +167,7 @@ CheckMailClientButtonText.Text=Verifica el client de correu
 EditEmailButtonText.Text=Edita el text del missatge
 MultipleRecipientsHintText.Text=Múltiples destinataris separats per comes
 RecipientsText.Text=Destinataris:
+EmailAutoDetect.Content=Reconeixement automàtic
 
 [EmailClientActionSettings]
 CheckMailClient=Verifica el client de correu.
diff --git a/src/clawPDF/languages/Chinese (Simplified).ini b/src/clawPDF/languages/Chinese (Simplified).ini
index e1e11b3e..1fb0bec1 100644
--- a/src/clawPDF/languages/Chinese (Simplified).ini	
+++ b/src/clawPDF/languages/Chinese (Simplified).ini	
@@ -167,6 +167,7 @@ CheckMailClientButtonText.Text=检查电子邮件客户端
 EditEmailButtonText.Text=编辑电子邮件文字
 MultipleRecipientsHintText.Text=以逗号分隔多个收件人
 RecipientsText.Text=收件人：
+EmailAutoDetect.Content=自动识别
 
 [EmailClientActionSettings]
 CheckMailClient=检查电子邮件客户端
diff --git a/src/clawPDF/languages/Chinese (Traditional).ini b/src/clawPDF/languages/Chinese (Traditional).ini
index d1d18a70..151e691b 100644
--- a/src/clawPDF/languages/Chinese (Traditional).ini	
+++ b/src/clawPDF/languages/Chinese (Traditional).ini	
@@ -167,6 +167,7 @@ CheckMailClientButtonText.Text=檢查電子郵件用戶端
 EditEmailButtonText.Text=編輯電子郵件文字
 MultipleRecipientsHintText.Text=以逗號分隔多個收件人
 RecipientsText.Text=收件人:
+EmailAutoDetect.Content=自動識別
 
 [EmailClientActionSettings]
 CheckMailClient=檢查電子郵件用戶端
diff --git a/src/clawPDF/languages/Corsican (France).ini b/src/clawPDF/languages/Corsican (France).ini
index 273d79d9..9eb4acd3 100644
--- a/src/clawPDF/languages/Corsican (France).ini	
+++ b/src/clawPDF/languages/Corsican (France).ini	
@@ -167,6 +167,7 @@ CheckMailClientButtonText.Text=Verificà l'eMail
 EditEmailButtonText.Text=Mudificà u Testu di l'eMail
 MultipleRecipientsHintText.Text=I destinatarii diversi sò staccati da virgule
 RecipientsText.Text=Destinatarii :
+EmailAutoDetect.Content=Ricunniscenza automatica
 
 [EmailClientActionSettings]
 CheckMailClient=Verificazione di l'appiecazione di messaghjeria
diff --git a/src/clawPDF/languages/Czech.ini b/src/clawPDF/languages/Czech.ini
index ef74ef86..98cab993 100644
--- a/src/clawPDF/languages/Czech.ini
+++ b/src/clawPDF/languages/Czech.ini
@@ -167,6 +167,7 @@ CheckMailClientButtonText.Text=Zkontroluj mailového klienta
 EditEmailButtonText.Text=Uprav text emailu
 MultipleRecipientsHintText.Text=Vícero příjemců se odděluje středníkem
 RecipientsText.Text=Příjemci:
+EmailAutoDetect.Content=Automatické rozpoznávání
 
 [EmailClientActionSettings]
 CheckMailClient=Zkontrolovat e-mailového klienta.
diff --git a/src/clawPDF/languages/Danish.ini b/src/clawPDF/languages/Danish.ini
index 28865004..f81df14b 100644
--- a/src/clawPDF/languages/Danish.ini
+++ b/src/clawPDF/languages/Danish.ini
@@ -167,6 +167,7 @@ CheckMailClientButtonText.Text=Tjek e-mail-klient
 EditEmailButtonText.Text=Rediger e-mail
 MultipleRecipientsHintText.Text=Flere modtagere adskilles med kommaer
 RecipientsText.Text=Modtagere:
+EmailAutoDetect.Content=Automatisk genkendelse
 
 [EmailClientActionSettings]
 CheckMailClient=Tjek e-mail-klient
diff --git a/src/clawPDF/languages/Dutch.ini b/src/clawPDF/languages/Dutch.ini
index b8595d9d..8b08c97c 100644
--- a/src/clawPDF/languages/Dutch.ini
+++ b/src/clawPDF/languages/Dutch.ini
@@ -167,6 +167,7 @@ CheckMailClientButtonText.Text=Controleer e-mailprogramma
 EditEmailButtonText.Text=Bewerk e-mail-bericht
 MultipleRecipientsHintText.Text=Ontvangers worden met een komma gescheiden
 RecipientsText.Text=Ontvangers:
+EmailAutoDetect.Content=Automatische herkenning
 
 [EmailClientActionSettings]
 CheckMailClient=Controleer mailprogramma.
diff --git a/src/clawPDF/languages/English.ini b/src/clawPDF/languages/English.ini
index 5567af5e..cf48d8b4 100644
--- a/src/clawPDF/languages/English.ini
+++ b/src/clawPDF/languages/English.ini
@@ -164,6 +164,7 @@ CheckMailClientButtonText.Text=Check E-Mail Client
 EditEmailButtonText.Text=Edit E-Mail Text
 MultipleRecipientsHintText.Text=Multiple recipients are separated by commas
 RecipientsText.Text=Recipients:
+EmailAutoDetect.Content=Automatic recognition
 
 [EmailClientActionSettings]
 CheckMailClient=Check e-mail client
diff --git a/src/clawPDF/languages/Estonian.ini b/src/clawPDF/languages/Estonian.ini
index d5f0e2d3..172bef4b 100644
--- a/src/clawPDF/languages/Estonian.ini
+++ b/src/clawPDF/languages/Estonian.ini
@@ -163,6 +163,7 @@ CheckMailClientButtonText.Text=Määra e-maili klient
 EditEmailButtonText.Text=Muuda e-maili teksti
 MultipleRecipientsHintText.Text=Mitu saajat tuleb eraldada komaga
 RecipientsText.Text=Saajad:
+EmailAutoDetect.Content=Automaatne äratundmine
 
 [EmailClientActionSettings]
 CheckMailClient=Otsin e-maili klienti
diff --git a/src/clawPDF/languages/Finnish.ini b/src/clawPDF/languages/Finnish.ini
index 71f50d0e..66643852 100644
--- a/src/clawPDF/languages/Finnish.ini
+++ b/src/clawPDF/languages/Finnish.ini
@@ -163,6 +163,7 @@ CheckMailClientButtonText.Text=Tarkasta sähköpostisovellus
 EditEmailButtonText.Text=Muokkaa sanomaa
 MultipleRecipientsHintText.Text=Erota vastaanottajat toisistaan pilkuilla
 RecipientsText.Text=Vastaanottajat:
+EmailAutoDetect.Content=Automaattinen tunnistus
 
 [EmailClientActionSettings]
 CheckMailClient=Tarkasta sähköpostisovellus
diff --git a/src/clawPDF/languages/French.ini b/src/clawPDF/languages/French.ini
index 99271523..dc3e5157 100644
--- a/src/clawPDF/languages/French.ini
+++ b/src/clawPDF/languages/French.ini
@@ -167,6 +167,7 @@ CheckMailClientButtonText.Text=Vérifier le courriel
 EditEmailButtonText.Text=Modifier le texte
 MultipleRecipientsHintText.Text=Séparer les destinataires par des virgules
 RecipientsText.Text=Destinataires :
+EmailAutoDetect.Content=Reconnaissance automatique
 
 [EmailClientActionSettings]
 CheckMailClient=Vérifiez votre logiciel de messagerie.
diff --git a/src/clawPDF/languages/Gaelic (Scotland).ini b/src/clawPDF/languages/Gaelic (Scotland).ini
index 938aa970..8fc05a7c 100644
--- a/src/clawPDF/languages/Gaelic (Scotland).ini	
+++ b/src/clawPDF/languages/Gaelic (Scotland).ini	
@@ -163,6 +163,7 @@ CheckMailClientButtonText.Text=Thoir sùil air cliant a' phuist-d
 EditEmailButtonText.Text=Deasaich teacsa a' phuist-d
 MultipleRecipientsHintText.Text=Cuir cromagan eadar na h-ainmean ma tha thu airson a chur gu iomadh duine
 RecipientsText.Text=Faightearan:
+EmailAutoDetect.Content=Aithneachadh fèin-ghluasadach
 
 [EmailClientActionSettings]
 CheckMailClient=Thoir sùil air a' phrògram a chleachdas tu airson post-d.
diff --git a/src/clawPDF/languages/German.ini b/src/clawPDF/languages/German.ini
index 99d4126b..52e4f94c 100644
--- a/src/clawPDF/languages/German.ini
+++ b/src/clawPDF/languages/German.ini
@@ -164,6 +164,7 @@ CheckMailClientButtonText.Text=E-Mail-Client testen
 EditEmailButtonText.Text=Nachricht bearbeiten
 MultipleRecipientsHintText.Text=Mehrere Empfänger werden durch Kommas getrennt
 RecipientsText.Text=Empfänger:
+EmailAutoDetect.Content=Automatische Erkennung
 
 [EmailClientActionSettings]
 CheckMailClient=E-Mail-Client testen
diff --git a/src/clawPDF/languages/Hungarian.ini b/src/clawPDF/languages/Hungarian.ini
index 0123fa8d..880a2aa1 100644
--- a/src/clawPDF/languages/Hungarian.ini
+++ b/src/clawPDF/languages/Hungarian.ini
@@ -163,6 +163,7 @@ CheckMailClientButtonText.Text=Levelezőprogram tesztelése
 EditEmailButtonText.Text=Üzenet szövegének szerkesztése
 MultipleRecipientsHintText.Text=Több címzett esetén vesszővel választhatja el őket egymástól
 RecipientsText.Text=Címzettek:
+EmailAutoDetect.Content=Automatikus felismerés
 
 [EmailClientActionSettings]
 CheckMailClient=Levelezőprogram tesztelése
diff --git a/src/clawPDF/languages/Italian.ini b/src/clawPDF/languages/Italian.ini
index 1daad514..80c378e0 100644
--- a/src/clawPDF/languages/Italian.ini
+++ b/src/clawPDF/languages/Italian.ini
@@ -167,6 +167,7 @@ CheckMailClientButtonText.Text=Controlla client email
 EditEmailButtonText.Text=Modifica testo email
 MultipleRecipientsHintText.Text=Destinatari multipli separati da virgola
 RecipientsText.Text=Destinatari:
+EmailAutoDetect.Content=Riconoscimento automatico
 
 [EmailClientActionSettings]
 CheckMailClient=Controlla client email
diff --git a/src/clawPDF/languages/Lithuanian.ini b/src/clawPDF/languages/Lithuanian.ini
index 29f23470..6c8709b7 100644
--- a/src/clawPDF/languages/Lithuanian.ini
+++ b/src/clawPDF/languages/Lithuanian.ini
@@ -165,6 +165,7 @@ CheckMailClientButtonText.Text=Tikrinti el. pašto klientą
 EditEmailButtonText.Text=Redaguoti el. pašto tekstą
 MultipleRecipientsHintText.Text=Keli gavėjai atskirti kableliais
 RecipientsText.Text=Gavėjai:
+EmailAutoDetect.Content=Automatinis atpažinimas
 
 [EmailClientActionSettings]
 CheckMailClient=Patikrinti el. pašto klientą.
diff --git a/src/clawPDF/languages/Norwegian, Bokmal (Norway).ini b/src/clawPDF/languages/Norwegian, Bokmal (Norway).ini
index ee9b7e05..04f3447e 100644
--- a/src/clawPDF/languages/Norwegian, Bokmal (Norway).ini	
+++ b/src/clawPDF/languages/Norwegian, Bokmal (Norway).ini	
@@ -167,6 +167,7 @@ CheckMailClientButtonText.Text=Sjekk e-mail-klient
 EditEmailButtonText.Text=Rediger e-mail
 MultipleRecipientsHintText.Text=Flere mottakere adskilles med kommaer
 RecipientsText.Text=Mottakere:
+EmailAutoDetect.Content=Automatisk gjenkjenning
 
 [EmailClientActionSettings]
 CheckMailClient=Sjekk e-mail-klient
diff --git a/src/clawPDF/languages/Polish.ini b/src/clawPDF/languages/Polish.ini
index 900f31dc..b61466ee 100644
--- a/src/clawPDF/languages/Polish.ini
+++ b/src/clawPDF/languages/Polish.ini
@@ -167,6 +167,7 @@ CheckMailClientButtonText.Text=Wybierz klienta poczty e-mail
 EditEmailButtonText.Text=Edytuj tekst e-mail
 MultipleRecipientsHintText.Text=Wielu odbiorców oddzielonych przecinkami
 RecipientsText.Text=Odbiorcy:
+EmailAutoDetect.Content=Automatyczne rozpoznawanie
 
 [EmailClientActionSettings]
 CheckMailClient=Wybierz klienta poczty e-mail
diff --git a/src/clawPDF/languages/Portuguese (Brazil).ini b/src/clawPDF/languages/Portuguese (Brazil).ini
index 98e57df4..31314d16 100644
--- a/src/clawPDF/languages/Portuguese (Brazil).ini	
+++ b/src/clawPDF/languages/Portuguese (Brazil).ini	
@@ -167,6 +167,7 @@ CheckMailClientButtonText.Text=Verificar Cliente de E-Mail
 EditEmailButtonText.Text=Editar Texto do E-mail
 MultipleRecipientsHintText.Text=Vários destinatários separados por vírgulas
 RecipientsText.Text=Destinatários:
+EmailAutoDetect.Content=Reconhecimento automático
 
 [EmailClientActionSettings]
 CheckMailClient=Verificar cliente de e-mail.
diff --git a/src/clawPDF/languages/Russian.ini b/src/clawPDF/languages/Russian.ini
index 55e08f37..c5bc9d1a 100644
--- a/src/clawPDF/languages/Russian.ini
+++ b/src/clawPDF/languages/Russian.ini
@@ -167,6 +167,7 @@ CheckMailClientButtonText.Text=Проверить клиента электро
 EditEmailButtonText.Text=Редактировать текст сообщения электронной почты
 MultipleRecipientsHintText.Text=Несколько получателей через запятую
 RecipientsText.Text=Получатели:
+EmailAutoDetect.Content=Автоматическое распознавание
 
 [EmailClientActionSettings]
 CheckMailClient=Проверить почтовый клиент
diff --git a/src/clawPDF/languages/Slovenian.ini b/src/clawPDF/languages/Slovenian.ini
index 9ebfe503..d84858b0 100644
--- a/src/clawPDF/languages/Slovenian.ini
+++ b/src/clawPDF/languages/Slovenian.ini
@@ -167,6 +167,7 @@ CheckMailClientButtonText.Text=Preveri e-poštni odjemalec
 EditEmailButtonText.Text=Uredi besedilo e-pošte
 MultipleRecipientsHintText.Text=Več prejemnikov ločite z vejicami.
 RecipientsText.Text=Prejemniki:
+EmailAutoDetect.Content=Samodejno prepoznavanje
 
 [EmailClientActionSettings]
 CheckMailClient=Preveri odjemalca e-pošte
diff --git a/src/clawPDF/languages/Spanish.ini b/src/clawPDF/languages/Spanish.ini
index beacb313..a099f5aa 100644
--- a/src/clawPDF/languages/Spanish.ini
+++ b/src/clawPDF/languages/Spanish.ini
@@ -167,6 +167,7 @@ CheckMailClientButtonText.Text=Verificar cliente de correo
 EditEmailButtonText.Text=Editar texto del mensaje
 MultipleRecipientsHintText.Text=Múltiples destinatarios separados por comas
 RecipientsText.Text=Destinatarios:
+EmailAutoDetect.Content=Reconocimiento automático
 
 [EmailClientActionSettings]
 CheckMailClient=Verificar el cliente de correo.
diff --git a/src/clawPDF/languages/Swedish.ini b/src/clawPDF/languages/Swedish.ini
index 6a06d8bb..bc394801 100644
--- a/src/clawPDF/languages/Swedish.ini
+++ b/src/clawPDF/languages/Swedish.ini
@@ -167,6 +167,7 @@ CheckMailClientButtonText.Text=Kontrollera e-mailklienten
 EditEmailButtonText.Text=Redigera e-mailtexten
 MultipleRecipientsHintText.Text=Flera mottagare åtskiljs med kommatecken
 RecipientsText.Text=Mottagare:
+EmailAutoDetect.Content=Automatisk igenkänning
 
 [EmailClientActionSettings]
 CheckMailClient=Kontrollera e-mailklienten
diff --git a/src/clawPDF_setup/clawPDF_setup.vdproj b/src/clawPDF_setup/clawPDF_setup.vdproj
index 94ef6013..23b73b19 100644
--- a/src/clawPDF_setup/clawPDF_setup.vdproj
+++ b/src/clawPDF_setup/clawPDF_setup.vdproj
@@ -435,6 +435,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_54B26D0C6496648DA7E2064743E048C9"
+        "OwnerKey" = "8:_2ADCA95456CE47B9A8F7651A167A03F4"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_54DAEFCABB423530814E7B37E623D50F"
         "OwnerKey" = "8:_31E8D79BBC17226562FFE29753A109AD"
         "MsmSig" = "8:_UNDEFINED"
@@ -2503,6 +2509,26 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_54B26D0C6496648DA7E2064743E048C9"
+            {
+            "SourcePath" = "8:clawPDF.tlb"
+            "TargetName" = "8:clawPDF.tlb"
+            "Tag" = "8:"
+            "Folder" = "8:_6D653F6EE3324579B145A191268F8DEA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:2"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
             "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_54DAEFCABB423530814E7B37E623D50F"
             {
             "AssemblyRegister" = "3:1"
@@ -4368,8 +4394,8 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:clawPDF 0.9.2"
-        "ProductCode" = "8:{115EE6AF-5F02-48B5-9BD3-3C2F841C6692}"
-        "PackageCode" = "8:{168E0D00-E63D-496A-AF42-B8ACCC60BC8B}"
+        "ProductCode" = "8:{F3493872-0C22-4C4B-B3E7-468D392F04B8}"
+        "PackageCode" = "8:{561ED73C-E2AC-4F42-B8BE-F46CFDD40A3C}"
         "UpgradeCode" = "8:{7D6DE248-9C3E-416C-8141-8178A480E45A}"
         "AspNetVersion" = "8:2.0.50727.0"
         "RestartWWWService" = "11:FALSE"