2 files changed, 9 insertions, 5 deletions

diff --git a/src/gmdocument.c b/src/gmdocument.c
index ae9f6d9c..e33be932 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -523,7 +523,7 @@ static void doLayout_GmDocument_(iGmDocument *d) {
             run.flags |= quoteBorder_GmRunFlag;
         }
         rightMargin = (type == text_GmLineType || type == bullet_GmLineType ||
-                       type == link_GmLineType || type == quote_GmLineType ? 5 : 0);
+                       type == quote_GmLineType ? 4 : 0);
         iAssert(!isEmpty_Range(&runLine)); /* must have something at this point */
         while (!isEmpty_Range(&runLine)) {
             run.bounds.pos = addX_I2(pos, indent * gap_Text);
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 0722976a..92966538 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -351,10 +351,14 @@ static void requestFinished_DocumentWidget_(iAnyObject *obj) {
 }
 
 static int documentWidth_DocumentWidget_(const iDocumentWidget *d) {
-    const iWidget *w      = constAs_Widget(d);
-    const iRect    bounds = bounds_Widget(w);
-    const iPrefs * prefs  = prefs_App();
-    return iMini(iMax(50 * gap_UI, bounds.size.x - gap_UI * d->pageMargin * 2),
+    const iWidget *w        = constAs_Widget(d);
+    const iRect    bounds   = bounds_Widget(w);
+    const iPrefs * prefs    = prefs_App();
+    const int      minWidth = 50 * gap_UI; /* lines must fit a word at least */
+    const float    adjust   = iClamp((float) bounds.size.x / gap_UI / 11 - 12,
+                                     -2.0f, 10.0f); /* adapt to width */
+    //printf("%f\n", adjust); fflush(stdout);
+    return iMini(iMax(minWidth, bounds.size.x - gap_UI * (d->pageMargin + adjust) * 2),
                  fontSize_UI * prefs->lineWidth * prefs->zoomPercent / 100);
 }