Less repetition in the text.

1 files changed, 5 insertions, 9 deletions

diff --git a/components/mailviewer/contents/ui/MailDataModel.qml b/components/mailviewer/contents/ui/MailDataModel.qml
index fa8c462b..ad0b1cc9 100644
--- a/components/mailviewer/contents/ui/MailDataModel.qml
+++ b/components/mailviewer/contents/ui/MailDataModel.qml
@@ -46,25 +46,21 @@ DelegateModel {
         function getDetails(signed, encrypted, signatureDetails)
         {
             var details = "";
-            if (signed && encrypted) {
-                details += qsTr("This message is signed and encrypted.") + "\n";
-            } else if (encrypted) {
+            if (encrypted) {
                 details += qsTr("This message is encrypted.") + "\n";
-            } else if (signed) {
-                details += qsTr("This message is signed.") + "\n";
             }
 
             if (signed) {
                 if (details.noSignaturesFound) {
-                    details += qsTr("Failed to validate the signature.") + "\n"
+                    details += qsTr("This message has been signed but we failed to validate the signature.") + "\n"
                 } else if (!signatureDetails.signatureIsGood) {
-                    details += qsTr("The signature is invalid.") + "\n"
+                    details += qsTr("This message is signed but the signature is invalid.") + "\n"
                 } else if (signatureDetails.keyMissing) {
-                    details += qsTr("This message has been signed using key %1.").arg(signatureDetails.keyId) + "\n";
+                    details += qsTr("This message has been signed using the key %1.").arg(signatureDetails.keyId) + "\n";
                     details += qsTr("The key details are not available.") + "\n";
                     return details;
                 } else {
-                    details += qsTr("This message has been signed using key %1 by %2.").arg(signatureDetails.keyId).arg(signatureDetails.signer) + "\n";
+                    details += qsTr("This message has been signed using the key %1 by %2.").arg(signatureDetails.keyId).arg(signatureDetails.signer) + "\n";
                     if (signatureDetails.keyRevoked) {
                         details += qsTr("The key was revoked.") + "\n"
                     }