diff --git a/README.md b/README.md
index 6bcb16b..1f07d62 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ The administrator of the Lufi instance you use will not be able to see what is i
 The encryption key part of the URL is a anchor (Cf. [Fragment Identifier](https://en.wikipedia.org/wiki/Fragment_identifier)), that means this part is only processed client-side and does not reach the server. :-)
 
 
-**Shipped version:** 0.05.18~ynh1
+**Shipped version:** 0.05.18~ynh2
 
 **Demo:** https://demo.lufi.io/
 
diff --git a/README_fr.md b/README_fr.md
index be1b35b..1fa2c50 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -23,7 +23,7 @@ The administrator of the Lufi instance you use will not be able to see what is i
 The encryption key part of the URL is a anchor (Cf. [Fragment Identifier](https://en.wikipedia.org/wiki/Fragment_identifier)), that means this part is only processed client-side and does not reach the server. :-)
 
 
-**Version incluse :** 0.05.18~ynh1
+**Version incluse :** 0.05.18~ynh2
 
 **Démo :** https://demo.lufi.io/
 
diff --git a/conf/lufi.conf.template b/conf/lufi.conf.template
index b83da8d..07e7ce8 100644
--- a/conf/lufi.conf.template
+++ b/conf/lufi.conf.template
@@ -110,7 +110,7 @@
     # Remember that it has to be in a directory writable by Lufi user
     # DO NOT CHANGE THIS IF FILES HAVE BEEN ALREADY UPLOADED: THEY WILL NOT BE DOWNLOADABLE ANYMORE
     # optional, default is 'files'
-    #upload_dir => 'files',
+    upload_dir => '__DATADIR__/upload',
 
     #!!!!!!!!!!!!!!!
     # EXPERIMENTAL !
@@ -169,7 +169,7 @@
 
     # Disable sending mail through the server
     # optional, default is false
-    #disable_mail_sending => 0,
+    disable_mail_sending => 1,
 
     #############
     # DB settings
diff --git a/manifest.json b/manifest.json
index 2b8bbf7..c383c6c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Self hosting files and sharing anonymous application",
         "fr": "Application d'hébergement et de partage de fichiers anonyme"
     },
-    "version": "0.05.18~ynh1",
+    "version": "0.05.18~ynh2",
     "url": "https://git.framasoft.org/luc/lufi",
     "upstream": {
         "license": "AGPL-3.0-or-later",
diff --git a/scripts/backup b/scripts/backup
index f50339b..a06ba98 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -30,6 +30,7 @@ app=$YNH_APP_INSTANCE_NAME
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 domain=$(ynh_app_setting_get --app=$app --key=domain)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
+datadir=$(ynh_app_setting_get --app=$app --key=datadir)
 
 #=================================================
 # DECLARE DATA AND CONF FILES TO BACKUP
@@ -42,6 +43,12 @@ ynh_print_info --message="Declaring files to be backed up..."
 
 ynh_backup --src_path="$final_path"
 
+#=================================================
+# BACKUP THE DATA DIR
+#=================================================
+
+ynh_backup --src_path="$datadir" --is_big
+
 #=================================================
 # BACKUP THE NGINX CONFIGURATION
 #=================================================
diff --git a/scripts/change_url b/scripts/change_url
index 7f21894..ecf19ea 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -37,6 +37,7 @@ db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd)
 db_user=$db_name
 secret=$(ynh_app_setting_get --app=$app --key=secret)
 max_file_size=$(ynh_app_setting_get --app=$app --key=max_file_size)
+datadir=$(ynh_app_setting_get --app=$app --key=datadir)
 
 #=================================================
 # BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP
diff --git a/scripts/install b/scripts/install
index 85e4c9e..45609a6 100644
--- a/scripts/install
+++ b/scripts/install
@@ -121,6 +121,20 @@ ynh_add_nginx_config
 
 #=================================================
 # SPECIFIC SETUP
+#=================================================
+# CREATE DATA DIRECTORY
+#=================================================
+ynh_script_progression --message="Creating a data directory..."
+
+datadir=/home/yunohost.app/$app
+ynh_app_setting_set --app=$app --key=datadir --value=$datadir
+
+mkdir -p $datadir/upload
+
+chmod 750 "$datadir"
+chmod -R o-rwx "$datadir"
+chown -R $app:www-data "$datadir"
+
 #=================================================
 # CONFIGURE LUFI
 #=================================================
diff --git a/scripts/remove b/scripts/remove
index f7d2e34..61314a5 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -21,6 +21,7 @@ port=$(ynh_app_setting_get --app=$app --key=port)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 db_user=$db_name
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
+datadir=$(ynh_app_setting_get --app=$app --key=datadir)
 
 #=================================================
 # STANDARD REMOVE
@@ -67,6 +68,17 @@ ynh_script_progression --message="Removing app main directory..."
 # Remove the app directory securely
 ynh_secure_remove --file="$final_path"
 
+#=================================================
+# REMOVE DATA DIR
+#=================================================
+
+# Remove the data directory if --purge option is used
+if [ "${YNH_APP_PURGE:-0}" -eq 1 ]
+then
+	ynh_script_progression --message="Removing app data directory..."
+	ynh_secure_remove --file="$datadir"
+fi
+
 #=================================================
 # REMOVE NGINX CONFIGURATION
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index 7fc5f5f..40dc3e0 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -33,6 +33,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 db_user=$db_name
 db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd)
+datadir=$(ynh_app_setting_get --app=$app --key=datadir)
 
 #=================================================
 # CHECK IF THE APP CAN BE RESTORED
@@ -63,6 +64,19 @@ chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
 chown -R $app:www-data "$final_path"
 
+#=================================================
+# RESTORE THE DATA DIRECTORY
+#=================================================
+ynh_script_progression --message="Restoring the data directory..."
+
+ynh_restore_file --origin_path="$datadir" --not_mandatory
+
+mkdir -p $datadir
+
+chmod 750 "$datadir"
+chmod -R o-rwx "$datadir"
+chown -R $app:www-data "$datadir"
+
 #=================================================
 # SPECIFIC RESTORATION
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index f347ec9..c31355e 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -26,6 +26,7 @@ db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 db_user=$db_name
 db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd)
 max_file_size=$(ynh_app_setting_get --app=$app --key=max_file_size)
+datadir=$(ynh_app_setting_get --app=$app --key=datadir)
 
 #=================================================
 # CHECK VERSION
@@ -113,6 +114,17 @@ if ynh_legacy_permissions_exists; then
 	ynh_app_setting_delete --app=$app --key=is_public
 fi
 
+# If datadir doesn't exist, create it
+if [ -z "$datadir" ]; then
+	datadir=/home/yunohost.app/$app
+	ynh_app_setting_set --app=$app --key=datadir --value=$datadir
+	mkdir -p $datadir
+	mv -f "$final_path/files" "$datadir/upload"
+	chmod 750 "$datadir"
+	chmod -R o-rwx "$datadir"
+	chown -R $app:www-data "$datadir"
+fi
+
 #=================================================
 # CREATE DEDICATED USER
 #=================================================