diff --git a/src/commands/inspect.rs b/src/commands/inspect.rs
index 405e4209..ce163241 100644
--- a/src/commands/inspect.rs
+++ b/src/commands/inspect.rs
@@ -258,8 +258,8 @@ where
             }
             inspect_signatures(sq, output, &sigs)?;
             if ! literal_prefix.is_empty() {
-                writeln!(output, "           Data: {:?}{}",
-                         String::from_utf8_lossy(&literal_prefix),
+                writeln!(output, "           Data: {}{}",
+                         ui::Safe(&literal_prefix),
                          if literal_prefix.len() == 40 { "..." } else { "" })?;
             }
 
diff --git a/src/commands/packet/dump.rs b/src/commands/packet/dump.rs
index 873f4fd6..c63a91c6 100644
--- a/src/commands/packet/dump.rs
+++ b/src/commands/packet/dump.rs
@@ -86,8 +86,8 @@ pub fn dump<W>(sq: &crate::Sq,
                 let mut prefix = vec![0; 40];
                 let n = pp.read(&mut prefix)?;
                 vec![
-                    format!("Content: {:?}{}",
-                            String::from_utf8_lossy(&prefix[..n]),
+                    format!("Content: {}{}",
+                            ui::Safe(&prefix[..n]),
                             if n == prefix.len() { "..." } else { "" }),
                 ]
             },
@@ -410,8 +410,8 @@ impl<'a, 'b, 'c> PacketDumper<'a, 'b, 'c> {
             Literal(ref l) => {
                 writeln!(output, "{}  Format: {}", i, l.format())?;
                 if let Some(filename) = l.filename() {
-                    writeln!(output, "{}  Filename: {:?}", i,
-                             String::from_utf8_lossy(filename))?;
+                    writeln!(output, "{}  Filename: {}", i,
+                             ui::Safe(filename))?;
                 }
                 if let Some(timestamp) = l.date() {
                     writeln!(output, "{}  Timestamp: {}", i,