diff --git a/src/action_cc.cc b/src/action_cc.cc
index d221969..9bb0019 100644
--- a/src/action_cc.cc
+++ b/src/action_cc.cc
@@ -3,6 +3,7 @@
 #include <QScreen>
 #include <QString>
 #include <QStringList>
+#include <QTextDocument>
 #include <QUrl>
 #include <QVariant>
 #include <QWidget>
@@ -853,5 +854,5 @@ NM_ACTION_(cmd_output) {
 
     return quiet
         ? nm_action_result_silent()
-        : nm_action_result_msg("%s", qPrintable(out));
+        : nm_action_result_msg("%s", qPrintable(Qt::convertFromPlainText(out, Qt::WhiteSpacePre)));
 }
diff --git a/src/nickelmenu.cc b/src/nickelmenu.cc
index 42c59dc..1ba182d 100644
--- a/src/nickelmenu.cc
+++ b/src/nickelmenu.cc
@@ -44,6 +44,7 @@ static QAction* (*AbstractNickelMenuController_createAction)(void*, QMenu* menu,
 
 // ConfirmationDialogFactory::showOKDialog shows an dialog box with an OK
 // button, and should only be called from the main thread (or a signal handler).
+// Note that ConfirmationDialog uses Qt::RichText for the body.
 static void (*ConfirmationDialogFactory_showOKDialog)(QString const& title, QString const& body);
 
 MainWindowController *(*MainWindowController_sharedInstance)();