5 files changed, 49 insertions, 34 deletions

diff --git a/src/app.c b/src/app.c
index 42244c80..c6b9a548 100644
--- a/src/app.c
+++ b/src/app.c
@@ -787,8 +787,9 @@ iBool handleCommand_App(const char *cmd) {
         const iString *url = collectNewCStr_String(suffixPtr_Command(cmd, "url"));
         iUrl parts;
         init_Url(&parts, url);
-        if (isEmpty_String(&d->httpProxy) &&
-            (equalCase_Rangecc(parts.scheme, "http") || equalCase_Rangecc(parts.scheme, "https"))) {
+        if (equalCase_Rangecc(parts.scheme, "mailto") ||
+            (isEmpty_String(&d->httpProxy) && (equalCase_Rangecc(parts.scheme, "http") ||
+                                               equalCase_Rangecc(parts.scheme, "https")))) {
             openInDefaultBrowser_App(url);
             return iTrue;
         }
diff --git a/src/gmdocument.c b/src/gmdocument.c
index b2561ee0..f8d5c7cf 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -229,6 +229,9 @@ static iRangecc addLink_GmDocument_(iGmDocument *d, iRangecc line, iGmLinkId *li
             else if (equalCase_Rangecc(parts.scheme, "about")) {
                 link->flags |= about_GmLinkFlag;
             }
+            else if (equalCase_Rangecc(parts.scheme, "mailto")) {
+                link->flags |= mailto_GmLinkFlag;
+            }
             /* Check the file name extension, if present. */
             if (!isEmpty_Range(&parts.path)) {
                 iString *path = newRange_String(parts.path);
@@ -258,7 +261,7 @@ static iRangecc addLink_GmDocument_(iGmDocument *d, iRangecc line, iGmLinkId *li
         trim_Rangecc(&desc);
         if (!isEmpty_Range(&desc)) {
             line = desc; /* Just show the description. */
-            link->flags |= userFriendly_GmLinkFlag;
+            link->flags |= humanReadable_GmLinkFlag;
         }
         else {
             line = capturedRange_RegExpMatch(&m, 1); /* Show the URL. */
@@ -321,10 +324,11 @@ static void doLayout_GmDocument_(iGmDocument *d) {
     static const float bottomMargin[max_GmLineType] = {
         0.0f, 0.5f, 1.0f, 0.5f, 0.5f, 0.5f, 0.5f, 1.0f
     };
-    static const char *arrow  = "\u27a4"; // "\u2192";
-    static const char *bullet = "\u2022";
-    static const char *folder = "\U0001f4c1";
-    static const char *globe  = "\U0001f310";
+    static const char *arrow    = "\u27a4";
+    static const char *envelope = "\U0001f4e7";
+    static const char *bullet   = "\u2022";
+    static const char *folder   = "\U0001f4c1";
+    static const char *globe    = "\U0001f310";
     const float midRunSkip = 0; /*0.120f;*/ /* extra space between wrapped text/quote lines */
     clear_Array(&d->layout);
     clearLinks_GmDocument_(d);
@@ -356,6 +360,7 @@ static void doLayout_GmDocument_(iGmDocument *d) {
         run.imageId = 0;
         enum iGmLineType type;
         int indent = 0;
+        /* Detect the type of the line. */
         if (!isPreformat) {
             type = lineType_GmDocument_(d, line);
             if (contentLine.start == content.start) {
@@ -479,7 +484,9 @@ static void doLayout_GmDocument_(iGmDocument *d) {
             const iGmLink *link = constAt_PtrArray(&d->links, run.linkId - 1);
             icon.text           = range_CStr(link->flags & file_GmLinkFlag
                                        ? folder
-                                       : link->flags & remote_GmLinkFlag ? globe : arrow);
+                                       : link->flags & mailto_GmLinkFlag
+                                             ? envelope
+                                             : link->flags & remote_GmLinkFlag ? globe : arrow);
             if (link->flags & remote_GmLinkFlag) {
                 icon.visBounds.pos.x -= gap_Text / 2;
             }
@@ -1114,6 +1121,7 @@ uint16_t linkImage_GmDocument(const iGmDocument *d, iGmLinkId linkId) {
 
 enum iColorId linkColor_GmDocument(const iGmDocument *d, iGmLinkId linkId, enum iGmLinkPart part) {
     const iGmLink *link = link_GmDocument_(d, linkId);
+    const int www_GmLinkFlag = http_GmLinkFlag | mailto_GmLinkFlag;
     if (link) {
         const iBool isBad = (link->flags & supportedProtocol_GmLinkFlag) == 0;
         if (part == icon_GmLinkPart) {
@@ -1121,24 +1129,24 @@ enum iColorId linkColor_GmDocument(const iGmDocument *d, iGmLinkId linkId, enum
                 return tmBadLink_ColorId;
             }
             if (link->flags & visited_GmLinkFlag) {
-                return link->flags & http_GmLinkFlag
+                return link->flags & www_GmLinkFlag
                            ? tmHypertextLinkIconVisited_ColorId
                            : link->flags & gopher_GmLinkFlag ? tmGopherLinkIconVisited_ColorId
                                                              : tmLinkIconVisited_ColorId;
             }
-            return link->flags & http_GmLinkFlag
+            return link->flags & www_GmLinkFlag
                        ? tmHypertextLinkIcon_ColorId
                        : link->flags & gopher_GmLinkFlag ? tmGopherLinkIcon_ColorId
                                                          : tmLinkIcon_ColorId;
         }
         if (part == text_GmLinkPart) {
-            return link->flags & http_GmLinkFlag
+            return link->flags & www_GmLinkFlag
                        ? tmHypertextLinkText_ColorId
                        : link->flags & gopher_GmLinkFlag ? tmGopherLinkText_ColorId
                                                          : tmLinkText_ColorId;
         }
         if (part == textHover_GmLinkPart) {
-            return link->flags & http_GmLinkFlag
+            return link->flags & www_GmLinkFlag
                        ? tmHypertextLinkTextHover_ColorId
                        : link->flags & gopher_GmLinkFlag ? tmGopherLinkTextHover_ColorId
                                                          : tmLinkTextHover_ColorId;
@@ -1147,13 +1155,13 @@ enum iColorId linkColor_GmDocument(const iGmDocument *d, iGmLinkId linkId, enum
             if (isBad) {
                 return tmBadLink_ColorId;
             }
-            return link->flags & http_GmLinkFlag
+            return link->flags & www_GmLinkFlag
                        ? tmHypertextLinkDomain_ColorId
                        : link->flags & gopher_GmLinkFlag ? tmGopherLinkDomain_ColorId
                                                          : tmLinkDomain_ColorId;
         }
         if (part == visited_GmLinkPart) {
-            return link->flags & http_GmLinkFlag
+            return link->flags & www_GmLinkFlag
                        ? tmHypertextLinkLastVisitDate_ColorId
                        : link->flags & gopher_GmLinkFlag ? tmGopherLinkLastVisitDate_ColorId
                                                          : tmLinkLastVisitDate_ColorId;
diff --git a/src/gmdocument.h b/src/gmdocument.h
index 23ce5e8a..b453fba9 100644
--- a/src/gmdocument.h
+++ b/src/gmdocument.h
@@ -47,7 +47,7 @@ enum iGmLinkFlags {
     mailto_GmLinkFlag             = iBit(7),
     supportedProtocol_GmLinkFlag  = 0xff,
     remote_GmLinkFlag             = iBit(9),
-    userFriendly_GmLinkFlag       = iBit(10),
+    humanReadable_GmLinkFlag      = iBit(10), /* link has a human-readable description */
     imageFileExtension_GmLinkFlag = iBit(11),
     audioFileExtension_GmLinkFlag = iBit(12),
     content_GmLinkFlag            = iBit(13), /* content visible below */
diff --git a/src/gmutil.c b/src/gmutil.c
index 131734b2..b2c7e93f 100644
--- a/src/gmutil.c
+++ b/src/gmutil.c
@@ -132,7 +132,8 @@ const iString *absoluteUrl_String(const iString *d, const iString *urlMaybeRelat
     iUrl rel;
     init_Url(&orig, d);
     init_Url(&rel, urlMaybeRelative);
-    if (equalCase_Rangecc(rel.scheme, "data") || equalCase_Rangecc(rel.scheme, "about")) {
+    if (equalCase_Rangecc(rel.scheme, "data") || equalCase_Rangecc(rel.scheme, "about") ||
+        equalCase_Rangecc(rel.scheme, "mailto")) {
         /* Special case, the contents should be left unparsed. */
         return urlMaybeRelative;
     }
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 84ad1139..e632a65c 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -1715,6 +1715,7 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
                           topRight_Rect(linkRect),
                           tmInlineContentMetadata_ColorId,
                           " \u2014 Fetching\u2026");
+                /* TODO: Show amount downloaded so far. */
             }
         }
         else if (isHover) {
@@ -1723,31 +1724,35 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
             const int       flags  = linkFlags_GmDocument(doc, linkId);
             iUrl parts;
             init_Url(&parts, url);
-            fg = linkColor_GmDocument(doc, linkId, textHover_GmLinkPart);
-            const iBool showHost  = (!isEmpty_Range(&parts.host) && flags & userFriendly_GmLinkFlag);
+            fg                    = linkColor_GmDocument(doc, linkId, textHover_GmLinkPart);
+            const iBool showHost  = (flags & humanReadable_GmLinkFlag &&
+                                    (!isEmpty_Range(&parts.host) || flags & mailto_GmLinkFlag));
             const iBool showImage = (flags & imageFileExtension_GmLinkFlag) != 0;
             const iBool showAudio = (flags & audioFileExtension_GmLinkFlag) != 0;
             iString str;
             init_String(&str);
+            /* Show scheme and host. */
             if (run->flags & endOfLine_GmRunFlag &&
                 (flags & (imageFileExtension_GmLinkFlag | audioFileExtension_GmLinkFlag) ||
                  showHost)) {
-                format_String(
-                    &str,
-                    " \u2014%s%s%s\r%c%s",
-                    showHost ? " " : "",
-                    showHost ? (!equalCase_Rangecc(parts.scheme, "gemini")
-                                    ? format_CStr("%s://%s",
-                                                  cstr_Rangecc(parts.scheme),
-                                                  cstr_Rangecc(parts.host))
-                                    : cstr_Rangecc(parts.host))
-                             : "",
-                    showHost && (showImage || showAudio) ? " \u2014" : "",
-                    showImage || showAudio
-                        ? asciiBase_ColorEscape + fg
-                        : (asciiBase_ColorEscape + linkColor_GmDocument(doc, run->linkId, domain_GmLinkPart)),
-                    showImage ? " View Image \U0001f5bc"
-                              : showAudio ? " Play Audio \U0001f3b5" : "");
+                format_String(&str,
+                              " \u2014%s%s%s\r%c%s",
+                              showHost ? " " : "",
+                              showHost ? (flags & mailto_GmLinkFlag
+                                              ? cstr_String(url)
+                                              : ~flags & gemini_GmLinkFlag
+                                                    ? format_CStr("%s://%s",
+                                                                  cstr_Rangecc(parts.scheme),
+                                                                  cstr_Rangecc(parts.host))
+                                                    : cstr_Rangecc(parts.host))
+                                       : "",
+                              showHost && (showImage || showAudio) ? " \u2014" : "",
+                              showImage || showAudio
+                                  ? asciiBase_ColorEscape + fg
+                                  : (asciiBase_ColorEscape +
+                                     linkColor_GmDocument(doc, run->linkId, domain_GmLinkPart)),
+                              showImage ? " View Image \U0001f5bc"
+                                        : showAudio ? " Play Audio \U0001f3b5" : "");
             }
             if (run->flags & endOfLine_GmRunFlag && flags & visited_GmLinkFlag) {
                 iDate date;