diff --git a/certbot/display/util.py b/certbot/display/util.py
index 8de607534..b4004997f 100644
--- a/certbot/display/util.py
+++ b/certbot/display/util.py
@@ -41,10 +41,15 @@ def _wrap_lines(msg):
     """
     lines = msg.splitlines()
     fixed_l = []
-    for line in lines:
-        fixed_l.append(textwrap.fill(line, 80))
-    return os.linesep.join(fixed_l)
 
+    for line in lines:
+        fixed_l.append(textwrap.fill(
+            line,
+            80,
+            break_long_words=False,
+            break_on_hyphens=False))
+
+    return os.linesep.join(fixed_l)
 
 @zope.interface.implementer(interfaces.IDisplay)
 class NcursesDisplay(object):
@@ -265,7 +270,11 @@ class FileDisplay(object):
 
         """
         ans = raw_input(
-            textwrap.fill("%s (Enter 'c' to cancel): " % message, 80))
+            textwrap.fill(
+                "%s (Enter 'c' to cancel): " % message,
+                80,
+                break_long_words=False,
+                break_on_hyphens=False))
 
         if ans == "c" or ans == "C":
             return CANCEL, "-1"
@@ -402,7 +411,11 @@ class FileDisplay(object):
         # Write out the menu choices
         for i, desc in enumerate(choices, 1):
             self.outfile.write(
-                textwrap.fill("{num}: {desc}".format(num=i, desc=desc), 80))
+                textwrap.fill(
+                    "{num}: {desc}".format(num=i, desc=desc),
+                    80,
+                    break_long_words=False,
+                    break_on_hyphens=False))
 
             # Keep this outside of the textwrap
             self.outfile.write(os.linesep)
diff --git a/certbot/reporter.py b/certbot/reporter.py
index d509cb0b8..43e8cd0dc 100644
--- a/certbot/reporter.py
+++ b/certbot/reporter.py
@@ -82,10 +82,15 @@ class Reporter(object):
                     print(le_util.ANSI_SGR_BOLD)
                 print('IMPORTANT NOTES:')
             first_wrapper = textwrap.TextWrapper(
-                initial_indent=' - ', subsequent_indent=(' ' * 3))
+                initial_indent=' - ',
+                subsequent_indent=(' ' * 3),
+                break_long_words=False,
+                break_on_hyphens=False)
             next_wrapper = textwrap.TextWrapper(
                 initial_indent=first_wrapper.subsequent_indent,
-                subsequent_indent=first_wrapper.subsequent_indent)
+                subsequent_indent=first_wrapper.subsequent_indent,
+                break_long_words=False,
+                break_on_hyphens=False)
         while not self.messages.empty():
             msg = self.messages.get()
             if self.config.quiet: