diff --git a/src/freedombone-controlpanel-user b/src/freedombone-controlpanel-user
index 4585320e..a41d16f1 100755
--- a/src/freedombone-controlpanel-user
+++ b/src/freedombone-controlpanel-user
@@ -860,18 +860,20 @@ function show_your_email_address {
     onionemailstr=
     if [[ "$HOSTNAME" != *'.onion' && "$onion_domain" ]]; then
         onionemailstr="\\n\\nOnion Email: ${USER}@${onion_domain}"
-        dialog_height=$((dialog_height+2))
+        dialog_height=$((dialog_height+3))
     fi
     msgstrbase=$"\\nYou can press SHIFT and then drag the mouse and right click to copy.\\n\\nEmail Address: ${MY_EMAIL_ADDRESS}${onionemailstr}\\n\\nKey ID: ${GPG_ID}\\n\\nFingerprint: ${GPG_FINGERPRINT}\\n\\nCreated: ${GPG_DATE}"
     bdsmail_address=
+    bdsmailstr=
     if [ ! -f ~/.mutt/bdsmail ]; then
-        bdsmail_address="\\n\\nI2P Address: "$(grep 'set from=' ~/.mutt/bdsmail | awk -F '=' '{print $2}')
-        dialog_height=$((dialog_height+2))
+        bdsmail_address=$(grep 'set from=' ~/.mutt/bdsmail | awk -F '=' '{print $2}')
+        bdsmailstr="\\n\\nI2P Address: ${bdsmail_address}"
+        dialog_height=$((dialog_height+3))
     fi
 
     dialog --title $"Show your Email Address" \
            --backtitle $"Freedombone User Control Panel" \
-           --msgbox "$msgstrbase${bdsmail_address}" $dialog_height 100
+           --msgbox "${msgstrbase}${bdsmailstr}" $dialog_height 100
 
     clear
     qr_code_shown=