diff --git a/app/models.py b/app/models.py
index ef9a2935..f0b3248f 100644
--- a/app/models.py
+++ b/app/models.py
@@ -424,7 +424,7 @@ class User(Base, ModelMixin, UserMixin, PasswordOracle):
 
     # whether to include the sender address in reverse-alias
     include_sender_in_reverse_alias = sa.Column(
-        sa.Boolean, default=False, nullable=False, server_default="0"
+        sa.Boolean, default=True, nullable=False, server_default="0"
     )
 
     # whether to use random string or random word as suffix
diff --git a/static/style.css b/static/style.css
index 3d792283..6c157051 100644
--- a/static/style.css
+++ b/static/style.css
@@ -213,4 +213,8 @@ textarea.parsley-error {
 }
 .middle-line:after {
   margin-left: 10px
+}
+
+.italic {
+    font-style: italic;
 }
\ No newline at end of file
diff --git a/templates/dashboard/mailbox_detail.html b/templates/dashboard/mailbox_detail.html
index a0e9064f..957170ad 100644
--- a/templates/dashboard/mailbox_detail.html
+++ b/templates/dashboard/mailbox_detail.html
@@ -71,6 +71,14 @@
         </form>
       </div>
       <!-- END Change email -->
+      {% if mailbox.pgp_finger_print and not mailbox.disable_pgp and current_user.include_sender_in_reverse_alias %}
+
+        <div class="alert alert-info">
+          Email headers like <span class="italic">From, To, Subject</span> aren't encrypted by PGP.
+          Currently, your reverse alias includes the sender address.
+          You can disable this on <a href="/dashboard/setting#sender-in-ra">Settings</a>.
+        </div>
+      {% endif %}
       <div class="card">
         <div class="card-body">
           <div class="card-title">
diff --git a/templates/dashboard/setting.html b/templates/dashboard/setting.html
index fde17285..a35c32f1 100644
--- a/templates/dashboard/setting.html
+++ b/templates/dashboard/setting.html
@@ -441,13 +441,11 @@
           Include sender address in reverse-alias
         </div>
         <div class="mb-3">
-          By default, the reverse-alias is randomly generated and doesn't contain any information about
-          the sender.
+          If this option is enabled, new reverse-alias will include the sender address (e.g. <span class="italic">sender_domain_com_gibberish@simplelogin.co</span>)
+          so you can quickly know the sender.
           <br />
-          Enabling this option will include the sender address in the reverse-alias.
-          <br />
-          This can be useful if you want to set up email filters based on the reverse-alias.
-          It will also make the reverse-alias more readable.
+          If disabled, a new reverse-alias will be randomly generated.
+          Please note that existing reverse-aliases won't change.
         </div>
         <form method="post" action="#sender-in-ra">
           <input type="hidden" name="form-name" value="sender-in-ra">