2 files changed, 21 insertions, 7 deletions

diff --git a/src/gmdocument.c b/src/gmdocument.c
index 5034373d..b403773a 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -820,7 +820,7 @@ static void doLayout_GmDocument_(iGmDocument *d) {
             if (!prefs->quoteIcon && type == quote_GmLineType) {
                 rts.run.flags |= quoteBorder_GmRunFlag;
             }
-            for (;;) { /* may need to retry */
+            for (;;) { /* need to retry if the font needs changing */
                 rts.run.flags |= startOfLine_GmRunFlag;
                 iWrapText wrapText = { .text     = line,
                                        .maxWidth = rts.isWordWrapped
@@ -841,12 +841,14 @@ static void doLayout_GmDocument_(iGmDocument *d) {
                             prun->visBounds.pos.x += offset;                            
                         }
                         if (type == bullet_GmLineType || type == link_GmLineType ||
-                            type == quote_GmLineType) {
+                            (type == quote_GmLineType && prefs->quoteIcon)) {
                             iGmRun *decor = back_Array(&d->layout);
                             iAssert(decor->flags & decoration_GmRunFlag);
                             decor->visBounds.pos.x = d->size.x - width_Rect(decor->visBounds) -
-                                                     decor->visBounds.pos.x + gap_Text *
-                                                     (type == bullet_GmLineType ? 1.5f : 1);
+                                                     decor->visBounds.pos.x +
+                                                     gap_Text * (type == bullet_GmLineType  ? 1.5f
+                                                                 : type == quote_GmLineType ? 0.0f
+                                                                                            : 1.0f);
                         }
                     }
                     commit_RunTypesetter_(&rts, d);
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index ea4909eb..7e6c2ea4 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -4193,7 +4193,10 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
         }
         if (run->flags & quoteBorder_GmRunFlag) {
             drawVLine_Paint(&d->paint,
-                            addX_I2(visPos, -gap_Text * 5 / 2),
+                            addX_I2(visPos,
+                                    !run->textParams.isRTL
+                                        ? -gap_Text * 5 / 2
+                                        : (width_Rect(run->visBounds) + gap_Text * 5 / 2)),
                             height_Rect(run->visBounds),
                             tmQuoteIcon_ColorId);
         }
@@ -4286,8 +4289,8 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
                  showHost)) {
                 format_String(
                     &str,
-                    " \u2014%s%s%s%s%s",
-                    showHost ? " " : "",
+                    "%s%s%s%s%s",
+                    showHost ? "" : "",
                     showHost
                         ? (flags & mailto_GmLinkFlag    ? cstr_String(url)
                            : ~flags & gemini_GmLinkFlag ? format_CStr("%s://%s",
@@ -4313,9 +4316,18 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
                 append_String(&str, collect_String(format_Date(&date, "%b %d")));
             }
             if (!isEmpty_String(&str)) {
+                if (run->textParams.isRTL) {
+                    appendCStr_String(&str, " \u2014 ");
+                }
+                else {
+                    prependCStr_String(&str, " \u2014 ");
+                }
                 const iInt2 textSize = measure_Text(metaFont, cstr_String(&str)).bounds.size;
                 int tx = topRight_Rect(linkRect).x;
                 const char *msg = cstr_String(&str);
+                if (run->textParams.isRTL) {
+                    tx = topLeft_Rect(linkRect).x - textSize.x;                    
+                }
                 if (tx + textSize.x > right_Rect(d->widgetBounds)) {
                     tx = right_Rect(d->widgetBounds) - textSize.x;
                     fillRect_Paint(&d->paint, (iRect){ init_I2(tx, top_Rect(linkRect)), textSize },