diff --git a/bin/_blackbox_common.sh b/bin/_blackbox_common.sh
index f9c8276..b3580c5 100755
--- a/bin/_blackbox_common.sh
+++ b/bin/_blackbox_common.sh
@@ -181,7 +181,7 @@ function decrypt_file() {
   encrypted="$1"
   unencrypted="$2"
 
-  echo "========== EXTRACTING $unencrypted"
+  echo '========== EXTRACTING ''"'$unencrypted'"'
 
   old_umask=$(umask)
   umask "$DECRYPT_UMASK"
diff --git a/bin/blackbox_edit_end b/bin/blackbox_edit_end
index 1a6d032..5efb477 100755
--- a/bin/blackbox_edit_end
+++ b/bin/blackbox_edit_end
@@ -10,8 +10,8 @@ source "${blackbox_home}/_blackbox_common.sh"
 
 unencrypted_file=$(get_unencrypted_filename "$1")
 encrypted_file=$(get_encrypted_filename "$1")
-echo ========== PLAINFILE "$unencrypted_file"
-echo ========== ENCRYPTED "$encrypted_file"
+echo ========== PLAINFILE '"'$unencrypted_file'"'
+echo ========== ENCRYPTED '"'$encrypted_file'"'
 
 fail_if_not_on_cryptlist "$unencrypted_file"
 fail_if_not_exists "$unencrypted_file" "No unencrypted version to encrypt!"
@@ -22,6 +22,6 @@ shred_file "$unencrypted_file"
 
 _determine_vcs_base_and_type
 
-echo "========== UPDATED ${encrypted_file}"
+echo ========== UPDATED '"'$encrypted_file'"'
 echo "Likely next step:"
-echo "    $VCS_TYPE commit -m\"${encrypted_file} updated\" $encrypted_file"
+echo "    $VCS_TYPE commit -m\"${encrypted_file} updated\" \"$encrypted_file\""
diff --git a/bin/blackbox_edit_start b/bin/blackbox_edit_start
index 7d25bc8..a563eff 100755
--- a/bin/blackbox_edit_start
+++ b/bin/blackbox_edit_start
@@ -11,7 +11,7 @@ source "${blackbox_home}/_blackbox_common.sh"
 for param in """$@""" ; do
   unencrypted_file=$(get_unencrypted_filename "$param")
   encrypted_file=$(get_encrypted_filename "$param")
-  echo ========== PLAINFILE "$unencrypted_file"
+  echo ========== PLAINFILE '"'$unencrypted_file'"'
 
   fail_if_not_on_cryptlist "$unencrypted_file"
   fail_if_not_exists "$encrypted_file" "This should not happen."