diff --git a/package-lock.json b/package-lock.json
index 807a4355b..46f1c8f44 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "ctemplar",
-  "version": "2.5.63",
+  "version": "2.5.64",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -2168,13 +2168,13 @@
       }
     },
     "@sentry/browser": {
-      "version": "6.7.2",
-      "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-6.7.2.tgz",
-      "integrity": "sha512-Lv0Ne1QcesyGAhVcQDfQa3hDPR/MhPSDTMg3xFi+LxqztchVc4w/ynzR0wCZFb8KIHpTj5SpJHfxpDhXYMtS9g==",
+      "version": "6.17.2",
+      "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-6.17.2.tgz",
+      "integrity": "sha512-4Ow5z9GxK5dG9+stBNKb7s6NoxE4wgEcHRmO66QTK4gH2NNmzV4R/aaZ7iDoS/lD86sH0M86jm76dpg9uiJPmw==",
       "requires": {
-        "@sentry/core": "6.7.2",
-        "@sentry/types": "6.7.2",
-        "@sentry/utils": "6.7.2",
+        "@sentry/core": "6.17.2",
+        "@sentry/types": "6.17.2",
+        "@sentry/utils": "6.17.2",
         "tslib": "^1.9.3"
       },
       "dependencies": {
@@ -2186,14 +2186,14 @@
       }
     },
     "@sentry/core": {
-      "version": "6.7.2",
-      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-6.7.2.tgz",
-      "integrity": "sha512-NTZqwN5nR94yrXmSfekoPs1mIFuKvf8esdIW/DadwSKWAdLJwQTJY9xK/8PQv+SEzd7wiitPAx+mCw2By1xiNQ==",
-      "requires": {
-        "@sentry/hub": "6.7.2",
-        "@sentry/minimal": "6.7.2",
-        "@sentry/types": "6.7.2",
-        "@sentry/utils": "6.7.2",
+      "version": "6.17.2",
+      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-6.17.2.tgz",
+      "integrity": "sha512-Uew0CNMr+QvowrF4EJYjOUgHep/sZJ3l5zevPEELugIgqWBodd+ZDCV3fQFR7cr6KOqx1rMgVrgcKIkLl0l+RA==",
+      "requires": {
+        "@sentry/hub": "6.17.2",
+        "@sentry/minimal": "6.17.2",
+        "@sentry/types": "6.17.2",
+        "@sentry/utils": "6.17.2",
         "tslib": "^1.9.3"
       },
       "dependencies": {
@@ -2205,12 +2205,12 @@
       }
     },
     "@sentry/hub": {
-      "version": "6.7.2",
-      "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-6.7.2.tgz",
-      "integrity": "sha512-05qVW6ymChJsXag4+fYCQokW3AcABIgcqrVYZUBf6GMU/Gbz5SJqpV7y1+njwWvnPZydMncP9LaDVpMKbE7UYQ==",
+      "version": "6.17.2",
+      "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-6.17.2.tgz",
+      "integrity": "sha512-CMi6jU920bTwRTmGHjP4u8toOx4gm1dsx+rsxvp+FKzqRwpwoyi9mOw8oEYERVzaqaYceGdFylyRUrjdf0f77g==",
       "requires": {
-        "@sentry/types": "6.7.2",
-        "@sentry/utils": "6.7.2",
+        "@sentry/types": "6.17.2",
+        "@sentry/utils": "6.17.2",
         "tslib": "^1.9.3"
       },
       "dependencies": {
@@ -2222,12 +2222,12 @@
       }
     },
     "@sentry/minimal": {
-      "version": "6.7.2",
-      "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-6.7.2.tgz",
-      "integrity": "sha512-jkpwFv2GFHoVl5vnK+9/Q+Ea8eVdbJ3hn3/Dqq9MOLFnVK7ED6MhdHKLT79puGSFj+85OuhM5m2Q44mIhyS5mw==",
+      "version": "6.17.2",
+      "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-6.17.2.tgz",
+      "integrity": "sha512-Cdh+iM6QhLKfxwUWWP4mk2K7+EsQj4tuF2dGQke4Zcbp7zQ7wbcMruUcZHiZfvg5kiSYxwNVkH7cXMzcO7AJsg==",
       "requires": {
-        "@sentry/hub": "6.7.2",
-        "@sentry/types": "6.7.2",
+        "@sentry/hub": "6.17.2",
+        "@sentry/types": "6.17.2",
         "tslib": "^1.9.3"
       },
       "dependencies": {
@@ -2239,16 +2239,16 @@
       }
     },
     "@sentry/types": {
-      "version": "6.7.2",
-      "resolved": "https://registry.npmjs.org/@sentry/types/-/types-6.7.2.tgz",
-      "integrity": "sha512-h21Go/PfstUN+ZV6SbwRSZVg9GXRJWdLfHoO5PSVb3TVEMckuxk8tAE57/u+UZDwX8wu+Xyon2TgsKpiWKxqUg=="
+      "version": "6.17.2",
+      "resolved": "https://registry.npmjs.org/@sentry/types/-/types-6.17.2.tgz",
+      "integrity": "sha512-UrFLRDz5mn253O8k/XftLxoldF+NyZdkqKLGIQmST5HEVr7ub9nQJ4Y5ZFA3zJYWpraaW8faIbuw+pgetC8hmQ=="
     },
     "@sentry/utils": {
-      "version": "6.7.2",
-      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-6.7.2.tgz",
-      "integrity": "sha512-9COL7aaBbe61Hp5BlArtXZ1o/cxli1NGONLPrVT4fMyeQFmLonhUiy77NdsW19XnvhvaA+2IoV5dg3dnFiF/og==",
+      "version": "6.17.2",
+      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-6.17.2.tgz",
+      "integrity": "sha512-ePWtO44KJQwUULOiU86fa1WU3Ird2TH0i39gqB2d3zNS3QyVp9qPlzSdPKSPJ9LdgadzBHw7ikEuE+GY8JTrhA==",
       "requires": {
-        "@sentry/types": "6.7.2",
+        "@sentry/types": "6.17.2",
         "tslib": "^1.9.3"
       },
       "dependencies": {
diff --git a/package.json b/package.json
index 8ff776c08..4339742c3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ctemplar",
-  "version": "2.5.64",
+  "version": "2.5.65",
   "license": "Apache",
   "main": "electron-main.js",
   "description": "Angular webclient (with Linux, macOS and Windows desktop clients) for CTemplar's encrypted email service.",
@@ -49,7 +49,7 @@
     "@ngrx/store-devtools": "^10.1.2",
     "@ngx-translate/core": "^12.1.2",
     "@ngx-translate/http-loader": "^4.0.0",
-    "@sentry/browser": "^6.7.2",
+    "@sentry/browser": "^6.17.2",
     "angular2-cookie-law": "^7.0.1",
     "bcryptjs": "^2.4.3",
     "electron-context-menu": "^3.1.0",
diff --git a/src/app/mail/mail-contact/mail-contact.component.html b/src/app/mail/mail-contact/mail-contact.component.html
index a2fc7b268..ae14815e8 100644
--- a/src/app/mail/mail-contact/mail-contact.component.html
+++ b/src/app/mail/mail-contact/mail-contact.component.html
@@ -194,12 +194,12 @@
         <table class="table mail-contact">
           <thead class="mail-contact-header border-bottom-0 hidden-xs-down">
             <tr>
-              <th></th>
-              <th></th>
-              <th>
+              <th id="contact-check"></th>
+              <th id="contact-star"></th>
+              <th id="contact-name">
                 <strong>{{ 'common.name' | translate }}</strong>
               </th>
-              <th>
+              <th id="contact-email">
                 <strong>{{ 'common.email' | translate }}</strong>
               </th>
             </tr>
@@ -211,7 +211,7 @@
                 *ngFor="let contact of contactsState.contacts"
                 [class.active-contact]="selectedContact == contact"
               >
-                <td (click)="checkContact(contact)">
+                <td (click)="checkContact(contact)" headers="contact-check">
                   <div class="mail-list-col-item mail-checkbox">
                     <mat-checkbox
                       [(ngModel)]="contact.markForDelete"
@@ -224,7 +224,7 @@
                     <label [attr.for]="contact.id" class="fancy-field-empty"></label>
                   </div>
                 </td>
-                <td>
+                <td headers="contact-star">
                   <a
                     [ngbTooltip]="
                       contact.starred ? ('mail_list.remove_star' | translate) : ('mail_list.start_message' | translate)
@@ -239,7 +239,7 @@
                     <i class="icon icon-star-filled" [ngClass]="{ 'icon-star': !contact.starred }"></i>
                   </a>
                 </td>
-                <td (click)="editContact(contact, addUserContent)">
+                <td (click)="editContact(contact, addUserContent)" headers="contact-name">
                   <div class="mail-list-col-item mail-from-name cursor-pointer">
                     <span
                       *ngIf="contact.is_encrypted && !contact.name; else contactName"
@@ -252,7 +252,7 @@
                     </ng-template>
                   </div>
                 </td>
-                <td (click)="editContact(contact, addUserContent)">
+                <td (click)="editContact(contact, addUserContent)" headers="contact-email">
                   <div class="mail-contact-col-lg cursor-pointer">
                     <div class="mail-desc">
                       <p>
@@ -283,7 +283,7 @@
                 *ngFor="let contact of contactsState.contacts"
                 [class.active-contact]="selectedContact == contact"
               >
-                <td (click)="checkContact(contact)">
+                <td (click)="checkContact(contact)" headers="contact-check">
                   <div class="mail-list-col-item mail-checkbox">
                     <mat-checkbox
                       [(ngModel)]="contact.markForDelete"
@@ -296,7 +296,7 @@
                     <label [attr.for]="contact.id" class="fancy-field-empty"></label>
                   </div>
                 </td>
-                <td (click)="editContact(contact, addUserContent)">
+                <td (click)="editContact(contact, addUserContent)" headers="contact-name">
                   <div class="mail-list-col-item cursor-pointer">
                     <span
                       *ngIf="contact.is_encrypted && !contact.name; else contactName"
@@ -328,7 +328,7 @@
                     </div>
                   </div>
                 </td>
-                <td>
+                <td headers="contact-star">
                   <a
                     (click)="contact.isDecryptedFrontend && toggleStarred(contact)"
                     [ngClass]="{ 'is-fav': contact.starred }"
diff --git a/src/app/mail/mail-sidebar/compose-mail/compose-mail.component.ts b/src/app/mail/mail-sidebar/compose-mail/compose-mail.component.ts
index 8cd9cab54..fd4a59e1e 100644
--- a/src/app/mail/mail-sidebar/compose-mail/compose-mail.component.ts
+++ b/src/app/mail/mail-sidebar/compose-mail/compose-mail.component.ts
@@ -2008,10 +2008,8 @@ export class ComposeMailComponent implements OnInit, AfterViewInit, OnDestroy {
         this.isMixedContacts$.next(isMixedContacts);
         this.pgpEncryptionType = isMixedContacts ? null : pgpEncryptionType;
 
-        // if encryption is set to PGP_INLINE or PGP_MIME and we have at least one external with PGP enabled
-        this.draftMail.is_encrypted = this.pgpEncryptionType
-          ? !this.receiversInfo.some(c => c?.isExternal)
-          : !!this.pgpEncryptionType;
+        // if encryption is set to PGP_INLINE or PGP_MIME or we have at least one external contact
+        this.draftMail.is_encrypted = !(this.pgpEncryptionType || this.receiversInfo.some(c => c?.isExternal));
         this.draftMail.encryption_type = this.pgpEncryptionType;
 
         if (this.pgpEncryptionType === PGPEncryptionType.PGP_INLINE && this.draftMail?.is_html) {
diff --git a/src/assets/static/email.html b/src/assets/static/email.html
index 83c533311..d70bb0c8d 100644
--- a/src/assets/static/email.html
+++ b/src/assets/static/email.html
@@ -293,7 +293,7 @@
                         line-height: 24px;
                       "
                     >
-                      You have received a secure massage from
+                      You have received a secure message from
                     </td>
                   </tr>
                   <tr>