diff --git a/src/freedombone-app-bdsmail b/src/freedombone-app-bdsmail
index 77a1ca0d..38478f65 100755
--- a/src/freedombone-app-bdsmail
+++ b/src/freedombone-app-bdsmail
@@ -173,12 +173,15 @@ function remove_bdsmail {
     remove_completion_param install_bdsmail
     sed -i '/bdsmail/d' $COMPLETION_FILE
     rm -rf /etc/skel/.mutt
+    if [ -d /etc/bdsmail ]; then
+        rm -rf /etc/bdsmail
+    fi
     remove_i2p
 }
 
 function install_bdsmail {
     if [ -d /etc/bdsmail ]; then
-        rm -rf /etc/bdsmail
+        remove_bdsmail
     fi
 
     if [ -d /repos/bdsmail ]; then