diff --git a/conf/.env b/conf/.env
index 052d571..3f4397d 100644
--- a/conf/.env
+++ b/conf/.env
@@ -14,3 +14,12 @@ POSTGRES_DATABASE=__DB_NAME__
 POSTGRES_USER=__DB_USER__
 POSTGRES_PORT=5432
 POSTGRES_HOST=localhost
+
+MAILER_ENABLED=1
+MAILER_HOST=localhost
+MAILER_PORT=25
+MAILER_SECURE=0
+MAILER_AUTH_USER=__APP__
+MAILER_AUTH_PASSWORD=__MAIL_PWD__
+MAILER_NOREPLY_NAME=__APP__
+MAILER_NOREPLY_EMAIL=reply@__DOMAIN__
diff --git a/doc/screenshots/screenshot.png b/doc/screenshots/screenshot.png
index 164e9e4..2db60cf 100644
Binary files a/doc/screenshots/screenshot.png and b/doc/screenshots/screenshot.png differ
diff --git a/manifest.toml b/manifest.toml
index 2e40a09..7b5d13b 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -4,12 +4,12 @@ packaging_format = 2
 
 id = "joplin"
 name = "Joplin"
-description.en = "Note-taking appliction"
-description.fr = "Application de prise de notes"
+description.en = "Note taking and to-do application with synchronisation capabilities"
+description.fr = "Application de prise de notes et de tâches avec capacités de synchronisation"
 
 version = "2.13.8~ynh1"
 
-maintainers = [""]
+maintainers = ["eric_G"]
 
 [upstream]
 license = "AGPL-3.0-or-later"
@@ -48,6 +48,7 @@ ram.runtime = "50M"
         autoupdate.strategy = "latest_github_tag"
 
     [resources.system_user]
+    allow_email = true
 
     [resources.install_dir]
 
diff --git a/scripts/restore b/scripts/restore
index dc1e79d..e89b8f0 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -22,7 +22,7 @@ chown -R $app:www-data "$install_dir"
 #=================================================
 # RESTORE THE MYSQL DATABASE
 #=================================================
-ynh_script_progression --message="Restoring the MySQL database..." --weight=1
+ynh_script_progression --message="Restoring the PostgreSQL database..." --weight=1
 
 ynh_psql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql
 
diff --git a/tests.toml b/tests.toml
index 26bb7e4..953b195 100644
--- a/tests.toml
+++ b/tests.toml
@@ -7,61 +7,3 @@ test_format = 1.0
     # ------------
     # Tests to run
     # ------------
-
-    # NB: the tests to run are automatically deduced by the CI script according to the
-    # content of the app's manifest. The declarations below allow to customize which
-    # tests are ran, possibly add special test suite to test special args, or
-    # declare which commits to test upgrade from.
-    #
-    # You can also decide (though this is discouraged!) to ban/ignore some tests,
-
-    exclude = ["install.private", "install.multi"]
-    # The test IDs to be used in only/exclude statements are:
-    # * install.root
-    # * install.subdir
-    # * install.nourl
-    # * install.multi
-    # * backup_restore
-    # * upgrade
-    # * upgrade.someCommitId
-    # * change_url
-    # NB: you should NOT need this except if you really have a good reason...
-
-    # For special usecases, sometimes you need to setup other things on the machine
-    # prior to installing the app (such as installing another app)
-    # (Remove this key entirely if not needed)
-    preinstall = """
-    sudo yunohost app install foobar
-    sudo yunohost user list
-    """
-
-    # -------------------------------
-    # Default args to use for install
-    # -------------------------------
-
-    # By default, the CI will automagically fill the 'standard' args
-    # such as domain, path, admin, is_public and password with relevant values
-    # and also install args with a "default" provided in the manifest..
-    # It should only make sense to declare custom args here for args with no default values
-
-    args.language = "fr_FR"
-    args.multisite = 0
-    # NB: you should NOT need those lines unless for custom questions with no obvious/default value
-
-    # -------------------------------
-    # Commits to test upgrade from
-    # -------------------------------
-
-    test_upgrade_from.00a1a6e7.name = "Upgrade from 5.4"
-    test_upgrade_from.00a1a6e7.args.foo = "bar"
-
-
-# This is an additional test suite
-[some_additional_testsuite]
-
-    # On additional tests suites, you can decide to run only specific tests
-
-    only = ["install.subdir"]
-
-    args.language = "en_GB"
-    args.multisite = 1