Can use generic subject without pgp (#1847)

* improve wording for hide my subject option

* can use generic subject on a non-pgp mailbox

---------

Co-authored-by: Son NK <son@simplelogin.io>

app/dashboard/views/mailbox_detail.py

@@ -191,25 +191,16 @@ def mailbox_detail_route(mailbox_id):
             )
         elif request.form.get("form-name") == "generic-subject":
             if request.form.get("action") == "save":
-                if not mailbox.pgp_enabled():
-                    flash(
-                        "Generic subject can only be used on PGP-enabled mailbox",
-                        "error",
-                    )
-                    return redirect(
-                        url_for("dashboard.mailbox_detail_route", mailbox_id=mailbox_id)
-                    )
-
                 mailbox.generic_subject = request.form.get("generic-subject")
                 Session.commit()
-                flash("Generic subject for PGP-encrypted email is enabled", "success")
+                flash("Generic subject is enabled", "success")
                 return redirect(
                     url_for("dashboard.mailbox_detail_route", mailbox_id=mailbox_id)
                 )
             elif request.form.get("action") == "remove":
                 mailbox.generic_subject = None
                 Session.commit()
-                flash("Generic subject for PGP-encrypted email is disabled", "success")
+                flash("Generic subject is disabled", "success")
                 return redirect(
                     url_for("dashboard.mailbox_detail_route", mailbox_id=mailbox_id)
                 )

email_handler.py

@@ -878,9 +878,6 @@ def forward_email_to_mailbox(
         headers_to_keep.append(headers.AUTHENTICATION_RESULTS)
     delete_all_headers_except(msg, headers_to_keep)
 
-    # create PGP email if needed
-    if mailbox.pgp_enabled() and user.is_premium() and not alias.disable_pgp:
-        LOG.d("Encrypt message using mailbox %s", mailbox)
     if mailbox.generic_subject:
         LOG.d("Use a generic subject for %s", mailbox)
         orig_subject = msg[headers.SUBJECT]
@@ -894,6 +891,10 @@ def forward_email_to_mailbox(
             f"""Forwarded by SimpleLogin to {alias.email} from "{sender}" with <b>{orig_subject}</b> as subject""",
         )
 
+    # create PGP email if needed
+    if mailbox.pgp_enabled() and user.is_premium() and not alias.disable_pgp:
+        LOG.d("Encrypt message using mailbox %s", mailbox)
+
         try:
             msg = prepare_pgp_message(
                 msg, mailbox.pgp_finger_print, mailbox.pgp_public_key, can_sign=True

templates/dashboard/mailbox_detail.html

@@ -137,37 +137,30 @@
             </form>
           </div>
         </div>
-        <div class="card" {% if not mailbox.pgp_enabled() %}
-           disabled {% endif %}>
-          <form method="post">
+      </div>
+      <div class="card" id="generic-subject">
+        <form method="post" action="#generic-subject">
           {{ csrf_form.csrf_token }}
           <input type="hidden" name="form-name" value="generic-subject">
           <div class="card-body">
             <div class="card-title">
-                Hide email subject when PGP is enabled
+              Hide email subject
               <div class="small-text mt-1">
-                  When PGP is enabled, you can choose to use a <b>generic</b> subject for the forwarded emails.
-                  The original subject is then added into the email body.
+                The original subject will be added to the email body and all forwarded emails will have the generic subject.
                 <br />
-                  As PGP does not encrypt the email subject and the email subject might contain sensitive information,
-                  this option will allow a further protection of your email content.
+                This option is often used when PGP is enabled.
+                As PGP does not encrypt the email subject, it allows a further protection of your email content.
               </div>
             </div>
-              <div class="alert alert-info">
-                As the email is encrypted, a subject like "Email for you"
-                will probably be rejected by your mailbox since it sounds like a spam.
-                <br />
-                Something like "Encrypted Email" would work much better :).
-              </div>
             <div class="form-group">
               <label class="form-label">Generic Subject</label>
-                <input name="generic-subject" {% if not mailbox.pgp_enabled() %}
-                   disabled {% endif %} class="form-control" maxlength="78" placeholder="Generic Subject" value="{{ mailbox.generic_subject or "" }}">
+              <input name="generic-subject"
+                     class="form-control"
+                     maxlength="78"
+                     placeholder="Generic Subject"
+                     value="{{ mailbox.generic_subject or "" }}">
             </div>
-                <button class="btn btn-primary" name="action" {% if not mailbox.pgp_enabled() %}
-                   disabled {% endif %} value="save">
-                  Save
-                </button>
+            <button class="btn btn-primary" name="action" value="save">Save</button>
             {% if mailbox.generic_subject %}
 
               <button class="btn btn-danger float-right" name="action" value="remove">Remove</button>
@@ -175,7 +168,6 @@
           </div>
         </form>
       </div>
-        </div>
       <hr />
       <h2 class="h4">Advanced Options</h2>
       {% if spf_available %}