diff --git a/ietf/templates/doc/document_ballot_content.html b/ietf/templates/doc/document_ballot_content.html
index 375e354804..4d35727d15 100644
--- a/ietf/templates/doc/document_ballot_content.html
+++ b/ietf/templates/doc/document_ballot_content.html
@@ -97,7 +97,7 @@ <h4 class="anchor-target" id="{{ p.ad.plain_name|slugify }}">
             <div class="panel-heading">
               <h5 class="panel-title"><b>{{ p.pos.name }}</b> ({{ p.discuss_time|date:"Y-m-d" }}{% if not p.for_current_revision %} for -{{ p.get_dochistory.rev}}{% endif %})</h5>
             </div>
-            <div class="panel-body"><pre class="ballot">{{ p.discuss|wrap_text:80|escape|urlize }}</pre></div>
+            <div class="panel-body"><pre class="ballot pasted">{{ p.discuss|escape|urlize }}</pre></div>
           </div>
         {% endif %}
 
@@ -106,7 +106,7 @@ <h5 class="panel-title"><b>{{ p.pos.name }}</b> ({{ p.discuss_time|date:"Y-m-d"
             <div class="panel-heading">
               <h5 class="panel-title"><b>Comment</b> ({{ p.comment_time|date:"Y-m-d" }}{% if not p.for_current_revision %} for -{{ p.get_dochistory.rev}}{% endif %})</h5>
             </div>
-            <div class="panel-body"><pre class="ballot">{{ p.comment|wrap_text:80|escape|urlize }}</pre></div>
+            <div class="panel-body"><pre class="ballot pasted">{{ p.comment|escape|urlize }}</pre></div>
           </div>
         {% endif %}
       {% endfor %}
diff --git a/ietf/templates/doc/shepherd_writeup.html b/ietf/templates/doc/shepherd_writeup.html
index f2b4ec63b0..b3feb1242e 100644
--- a/ietf/templates/doc/shepherd_writeup.html
+++ b/ietf/templates/doc/shepherd_writeup.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
+{% load ietf_filters %}
 
 {% block title %}
   Shepherd writeup for {{ doc.canonical_name }}-{{ doc.rev }}
@@ -10,7 +11,7 @@
   {% origin %}
   <h1>Shepherd writeup<br><small>{{ doc.canonical_name }}-{{ doc.rev }}</small></h1>
 
-  <pre>{{writeup}}</pre>
+  <pre class="pasted">{{writeup|escape|urlize}}</pre>
 
   {% if can_edit %}
     <a class="btn btn-primary" href="{% url "doc_edit_shepherd_writeup" name=doc.name %}">Edit</a>
diff --git a/static/css/ietf.css b/static/css/ietf.css
index 92f87aee29..65874824fd 100644
--- a/static/css/ietf.css
+++ b/static/css/ietf.css
@@ -195,6 +195,13 @@ pre {
     white-space: pre;
 }
 
+/* Some chunks of text are likely to be pasted into fields from other editing environments
+   which do various things with line-wrapping. Preserve whitespace to the extent possible. */
+.pasted {
+    white-space: pre-wrap;
+    word-break: keep-all;
+}
+
 /* Make ampersands pretty */
 /* This sets ampersand in a different font than the rest of the text. Fancy, but it's
 really better to select a pretty font in the first place.  Additionally, _which_ 'pretty'