diff --git a/charts/stable/joplin-server/Chart.yaml b/charts/stable/joplin-server/Chart.yaml
index b480137bbe2..fb18231ccda 100644
--- a/charts/stable/joplin-server/Chart.yaml
+++ b/charts/stable/joplin-server/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "2.7.4"
 description: This server allows you to sync any Joplin client
 name: joplin-server
-version: 8.0.42
+version: 8.1.0
 kubeVersion: ">=1.16.0-0"
 keywords:
   - joplin
diff --git a/charts/stable/joplin-server/questions.yaml b/charts/stable/joplin-server/questions.yaml
index 1de3c714134..02b30a5a8f0 100644
--- a/charts/stable/joplin-server/questions.yaml
+++ b/charts/stable/joplin-server/questions.yaml
@@ -13,24 +13,82 @@ questions:
 # Include{controllerExpert}
 # Include{controllerExpertExtraArgs}
   - variable: env
-    group: "Container Configuration"
-    label: "Image Environment"
+    group: Container Configuration
+    label: Image Environment
     schema:
       additional_attrs: true
       type: dict
       attrs:
         - variable: APP_BASE_URL
-          label: "APP_BASE_URL"
-          description: "Sets the APP_BASE_URL env var"
+          label: APP_BASE_URL
+          description: Sets the APP_BASE_URL env var
           schema:
             type: string
             required: true
             default: ""
+        - variable: MAILER_ENABLED
+          label: MAILER_ENABLED
+          description: Set 1 to enabled and 0 to disable
+          schema:
+            type: int
+            min: 0
+            max: 1
+            default: 0
+        - variable: MAILER_HOST
+          label: Mailer Host
+          description: Sets the MAILER_HOST env var, eg smtp.example.com
+          schema:
+            show_if: [["MAILER_ENABLED", "=", "1"]]
+            type: string
+            default: ""
+        - variable: MAILER_PORT
+          label: Mailer Port
+          description: Sets the MAILER_PORT env var, eg SMTP PORT 465
+          schema:
+            show_if: [["MAILER_ENABLED", "=", "1"]]
+            type: int
+            default: 465
+        - variable: MAILER_SECURE
+          label: Mailer Secure
+          description: Sets the MAILER_SECURE env var, HTTPS for the smtp
+          schema:
+            show_if: [["MAILER_ENABLED", "=", "1"]]
+            type: boolean
+            default: true
+        - variable: MAILER_AUTH_USER
+          label: Mailer Auth User
+          description: Sets the MAILER_AUTH_USER env var, username for Email server
+          schema:
+            show_if: [["MAILER_ENABLED", "=", "1"]]
+            type: string
+            default: ""
+        - variable: MAILER_AUTH_PASSWORD
+          label: Mailer Auth Password
+          description: Sets the MAILER_AUTH_PASSWORD env var, password for Email server
+          schema:
+            show_if: [["MAILER_ENABLED", "=", "1"]]
+            type: string
+            private: true
+            default: ""
+        - variable: MAILER_NOREPLY_NAME
+          label: Mailer No Reply Name
+          description: Sets the MAILER_NOREPLY_NAME env var, No Reply email name
+          schema:
+            show_if: [["MAILER_ENABLED", "=", "1"]]
+            type: string
+            default: ""
+        - variable: MAILER_NOREPLY_EMAIL
+          label: Mailer No Reply Email
+          description: Sets the MAILER_NOREPLY_EMAIL env var, No Reply default email
+          schema:
+            show_if: [["MAILER_ENABLED", "=", "1"]]
+            type: string
+            default: ""
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
-          label: "Main Service"
-          description: "The Primary service on which the healthcheck runs, often the webUI"
+          label: Main Service
+          description: The Primary service on which the healthcheck runs, often the webUI
           schema:
             additional_attrs: true
             type: dict
@@ -38,22 +96,22 @@ questions:
 # Include{serviceSelectorLoadBalancer}
 # Include{serviceSelectorExtras}
                     - variable: main
-                      label: "Main Service Port Configuration"
+                      label: Main Service Port Configuration
                       schema:
                         additional_attrs: true
                         type: dict
                         attrs:
                           - variable: port
-                            label: "Port"
-                            description: "This port exposes the container port on the service"
+                            label: Port
+                            description: This port exposes the container port on the service
                             schema:
                               type: int
                               default: 22300
                               required: true
 # Include{advancedPortHTTP}
                                 - variable: targetPort
-                                  label: "Target Port"
-                                  description: "The internal(!) port on the container the Application runs on"
+                                  label: Target Port
+                                  description: The internal(!) port on the container the Application runs on
                                   schema:
                                     type: int
                                     default: 22300
@@ -63,8 +121,8 @@ questions:
 # Include{serviceList}
 # Include{persistenceRoot}
         - variable: config
-          label: "App Config Storage"
-          description: "Stores the Application Configuration."
+          label: App Config Storage
+          description: Stores the Application Configuration.
           schema:
             additional_attrs: true
             type: dict
@@ -74,7 +132,7 @@ questions:
 # Include{persistenceList}
 # Include{ingressRoot}
         - variable: main
-          label: "Main Ingress"
+          label: Main Ingress
           schema:
             additional_attrs: true
             type: dict
@@ -87,42 +145,42 @@ questions:
 # Include{security}
 # Include{securityContextAdvancedRoot}
               - variable: privileged
-                label: "Privileged mode"
+                label: Privileged mode
                 schema:
                   type: boolean
                   default: false
               - variable: readOnlyRootFilesystem
-                label: "ReadOnly Root Filesystem"
+                label: ReadOnly Root Filesystem
                 schema:
                   type: boolean
                   default: false
               - variable: allowPrivilegeEscalation
-                label: "Allow Privilege Escalation"
+                label: Allow Privilege Escalation
                 schema:
                   type: boolean
                   default: false
               - variable: runAsNonRoot
-                label: "runAsNonRoot"
+                label: runAsNonRoot
                 schema:
                   type: boolean
                   default: false
 # Include{securityContextAdvanced}
 # Include{podSecurityContextRoot}
         - variable: runAsUser
-          label: "runAsUser"
-          description: "The UserID of the user running the application"
+          label: runAsUser
+          description: The UserID of the user running the application
           schema:
             type: int
             default: 0
         - variable: runAsGroup
-          label: "runAsGroup"
-          description: "The groupID this App of the user running the application"
+          label: runAsGroup
+          description: The groupID this App of the user running the application
           schema:
             type: int
             default: 0
         - variable: fsGroup
-          label: "fsGroup"
-          description: "The group that should own ALL storage."
+          label: fsGroup
+          description: The group that should own ALL storage.
           schema:
             type: int
             default: 568
diff --git a/charts/stable/joplin-server/values.yaml b/charts/stable/joplin-server/values.yaml
index de534733d65..7258209ad9d 100644
--- a/charts/stable/joplin-server/values.yaml
+++ b/charts/stable/joplin-server/values.yaml
@@ -26,6 +26,14 @@ env:
     secretKeyRef:
       name: dbcreds
       key: plainhost
+  MAILER_ENABLED: 0
+  MAILER_HOST: ""
+  MAILER_PORT: 465
+  MAILER_SECURE: true
+  MAILER_AUTH_USER: ""
+  MAILER_AUTH_PASSWORD: ""
+  MAILER_NOREPLY_NAME: ""
+  MAILER_NOREPLY_EMAIL: ""
 
 probes:
   liveness: