diff --git a/conf/backup-with-borg b/conf/backup-with-borg
index f153033..4d9bc7e 100644
--- a/conf/backup-with-borg
+++ b/conf/backup-with-borg
@@ -72,10 +72,11 @@ fi
 
 # Send mail on backup (partially) failed
 domain=$(hostname)
+repository="$(sudo yunohost app setting ${borg_id} repository)"
 if [ ! -z "$errors" ]; then
-    cat <(echo -e "$errors\n\n\n") "$log_file" "$err_file" | mail -s "[borg] Backup failed from $domain onto $repo" root
+    cat <(echo -e "$errors\n\n\n") "$log_file" "$err_file" | mail -s "[borg] Backup failed from $domain onto $repository" root
     exit 1
 else
-    cat $log_file | mail -s "[borg] Backup succeed from $domain onto $repo" root
+    cat $log_file | mail -s "[borg] Backup succeed from $domain onto $repository" root
     exit 0
 fi
diff --git a/manifest.json b/manifest.json
index 5744207..211c2c5 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Backup your server on a host server using Borg.",
         "fr": "Sauvegardez votre serveur sur un serveur distant avec Borg."
     },
-    "version": "1.1.16~ynh16",
+    "version": "1.1.16~ynh17",
     "url": "https://borgbackup.readthedocs.io",
     "license": "BSD-3-Clause",
     "maintainer": {
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 90945f3..8c53ce9 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -17,6 +17,7 @@ install_borg_with_pip () {
     if [ ! -d /opt/borg-env ]; then
         python3 -m venv /opt/borg-env
         /opt/borg-env/bin/python /opt/borg-env/bin/pip install wheel
+        ynh_print_info --message="Installing/compiling borg, this may take some time..."
         /opt/borg-env/bin/python /opt/borg-env/bin/pip install borgbackup[fuse]==$BORG_VERSION
         echo "#!/bin/bash
     /opt/borg-env/bin/python /opt/borg-env/bin/borg \"\$@\"" > /usr/local/bin/borg