diff --git a/apps/syndie/java/src/net/i2p/syndie/sml/HTMLPreviewRenderer.java b/apps/syndie/java/src/net/i2p/syndie/sml/HTMLPreviewRenderer.java
index 6a0b4d748..a48230c69 100644
--- a/apps/syndie/java/src/net/i2p/syndie/sml/HTMLPreviewRenderer.java
+++ b/apps/syndie/java/src/net/i2p/syndie/sml/HTMLPreviewRenderer.java
@@ -87,12 +87,23 @@ public class HTMLPreviewRenderer extends HTMLRenderer {
             _postBodyBuffer.append(getSpan("summDetailExternal")).append("External links:</span> ");
             for (int i = 0; i < _links.size(); i++) {
                 Link l = (Link)_links.get(i);
-                _postBodyBuffer.append("<a ").append(getClass("summDetailExternalLink")).append(" href=\"externallink.jsp?");
-                if (l.schema != null)
-                    _postBodyBuffer.append("schema=").append(sanitizeURL(l.schema)).append('&');
-                if (l.location != null)
-                    _postBodyBuffer.append("location=").append(sanitizeURL(l.location)).append('&');
-                _postBodyBuffer.append("\">").append(sanitizeString(l.location));
+                String schema = l.schema;
+                _postBodyBuffer.append("<p>Schema: ").append(schema).append("</p>");
+                _postBodyBuffer.append("<a ");
+                if(schema.equals("attachment")) {
+                    /* No need for externallink double checker */
+                    int ID = Integer.parseInt(l.location);
+                    _postBodyBuffer.append("href=\"").append(getAttachmentURL(ID));
+                    _postBodyBuffer.append("\">").append(sanitizeString(l.location));
+                } else {
+                    _postBodyBuffer.append(getClass("summDetailExternalLink")).append(" href=\"externallink.jsp?");
+                    if (l.schema != null)
+                            _postBodyBuffer.append("schema=").append(sanitizeURL(l.schema)).append('&');
+                    if (l.location != null)
+                            _postBodyBuffer.append("location=").append(sanitizeURL(l.location)).append('&');
+                    _postBodyBuffer.append("\">").append(sanitizeString(l.location));
+                }
+
                 _postBodyBuffer.append(getSpan("summDetailExternalNet")).append(" (").append(sanitizeString(l.schema)).append(")</span></a> ");
             }
             _postBodyBuffer.append("<br />\n");
diff --git a/apps/syndie/java/src/net/i2p/syndie/sml/HTMLRenderer.java b/apps/syndie/java/src/net/i2p/syndie/sml/HTMLRenderer.java
index 20c026189..15ce181a6 100644
--- a/apps/syndie/java/src/net/i2p/syndie/sml/HTMLRenderer.java
+++ b/apps/syndie/java/src/net/i2p/syndie/sml/HTMLRenderer.java
@@ -436,10 +436,20 @@ public class HTMLRenderer extends EventReceiverImpl {
             _links.add(l);
         if (!continueBody()) { return; }
         if ( (schema == null) || (location == null) ) return;
-        _bodyBuffer.append("<a ").append(getClass("externalLink")).append(" href=\"externallink.jsp?schema=");
-        _bodyBuffer.append(sanitizeURL(schema)).append("&location=");
-        _bodyBuffer.append(sanitizeURL(location)).append("&description=");
-        _bodyBuffer.append(sanitizeURL(text)).append("\">").append(sanitizeString(text)).append("</a>");
+        _bodyBuffer.append("<a ");
+        if ( schema.equals("attachment") ) {
+                int attachmentID = Integer.parseInt(location);
+                _bodyBuffer.append("href=\"").
+                        append(getAttachmentURL(attachmentID));
+        } else {
+                _bodyBuffer.append(getClass("externalLink")).append(" href=\"externallink.jsp?schema=");
+                _bodyBuffer.append(sanitizeURL(schema)).append("&location=");
+                _bodyBuffer.append(sanitizeURL(location)).append("&description=");
+                _bodyBuffer.append(sanitizeURL(text));
+        }
+        _bodyBuffer.append("\">").
+                    append(sanitizeString(text)).
+                    append("</a>");
     }
 
     protected static class Address {
@@ -639,12 +649,21 @@ public class HTMLRenderer extends EventReceiverImpl {
                 _postBodyBuffer.append(getSpan("summDetailExternal")).append("External links:</span> ");
                 for (int i = 0; i < _links.size(); i++) {
                     Link l = (Link)_links.get(i);
-                    _postBodyBuffer.append("<a ").append(getClass("summDetailExternalLink")).append(" href=\"externallink.jsp?");
-                    if (l.schema != null)
-                        _postBodyBuffer.append("schema=").append(sanitizeURL(l.schema)).append('&');
-                    if (l.location != null)
-                        _postBodyBuffer.append("location=").append(sanitizeURL(l.location)).append('&');
-                    _postBodyBuffer.append("\">").append(sanitizeString(l.location));
+                    String schema = l.schema;
+                    _postBodyBuffer.append("<a ");
+                    if(schema.equals("attachment")) {
+                            /* No need for externallink double checker */
+                            int ID = Integer.parseInt(l.location);
+                            _postBodyBuffer.append(" href=\"").append(getAttachmentURL(ID));
+                            _postBodyBuffer.append("\">").append(sanitizeString(l.location));
+                    } else {
+                            _postBodyBuffer.append(getClass("summDetailExternalLink")).append(" href=\"externallink.jsp?");
+                            if (l.schema != null)
+                                _postBodyBuffer.append("schema=").append(sanitizeURL(l.schema)).append('&');
+                            if (l.location != null)
+                                _postBodyBuffer.append("location=").append(sanitizeURL(l.location)).append('&');
+                            _postBodyBuffer.append("\">").append(sanitizeString(l.location));
+                    }
                     _postBodyBuffer.append(getSpan("summDetailExternalNet")).append(" (").append(sanitizeString(l.schema)).append(")</span></a> ");
                 }
                 _postBodyBuffer.append("<br />\n");
diff --git a/apps/syndie/java/src/net/i2p/syndie/sml/ThreadedHTMLRenderer.java b/apps/syndie/java/src/net/i2p/syndie/sml/ThreadedHTMLRenderer.java
index baec9ccd2..86b328ffa 100644
--- a/apps/syndie/java/src/net/i2p/syndie/sml/ThreadedHTMLRenderer.java
+++ b/apps/syndie/java/src/net/i2p/syndie/sml/ThreadedHTMLRenderer.java
@@ -405,12 +405,22 @@ public class ThreadedHTMLRenderer extends HTMLRenderer {
             _postBodyBuffer.append(getSpan("summDetailExternal")).append("External links:</span> ");
             for (int i = 0; i < _links.size(); i++) {
                 Link l = (Link)_links.get(i);
-                _postBodyBuffer.append("<a ").append(getClass("summDetailExternalLink")).append(" href=\"externallink.jsp?");
-                if (l.schema != null)
-                    _postBodyBuffer.append("schema=").append(sanitizeURL(l.schema)).append('&');
-                if (l.location != null)
-                    _postBodyBuffer.append("location=").append(sanitizeURL(l.location)).append('&');
-                _postBodyBuffer.append("\">").append(sanitizeString(l.location, 60));
+                String schema = l.schema;
+                    _postBodyBuffer.append("<a ");
+                    if(schema.equals("attachment")) {
+                            /* No need for externallink double checker */
+                            int ID = Integer.parseInt(l.location);
+                            _postBodyBuffer.append(" href=\"").append(getAttachmentURL(ID));
+                            _postBodyBuffer.append("\">").append(sanitizeString(l.location));
+                    } else {
+                            _postBodyBuffer.append(getClass("summDetailExternalLink")).append(" href=\"externallink.jsp?");
+                            if (l.schema != null)
+                                _postBodyBuffer.append("schema=").append(sanitizeURL(l.schema)).append('&');
+                            if (l.location != null)
+                                _postBodyBuffer.append("location=").append(sanitizeURL(l.location)).append('&');
+                            _postBodyBuffer.append("\">").append(sanitizeString(l.location));
+                    }
+
                 _postBodyBuffer.append(getSpan("summDetailExternalNet")).append(" (").append(sanitizeString(l.schema)).append(")</span></a> ");
             }
             _postBodyBuffer.append("<br />\n");
diff --git a/apps/syndie/jsp/smlref.jsp b/apps/syndie/jsp/smlref.jsp
index c32408a6c..e2f6b577f 100644
--- a/apps/syndie/jsp/smlref.jsp
+++ b/apps/syndie/jsp/smlref.jsp
@@ -17,11 +17,12 @@ request.setCharacterEncoding("UTF-8");
   <li>[cut]more inside[/cut] = &lt;a href="#"&gt;more inside...&lt;/a&gt;</li>
   <li>[quote][/quote] = Quoted text</li>
   <li>[img attachment="1"]alt[/img] = use attachment 1 as an image with 'alt' as the alt text</li>
+  <li>[link schema="attachment" location="0"]text[/link] = offer a link to one of the attachments in your post (redundant, but useful in context sometimes)
+  <li>[link schema="eep" location="http://forum.i2p"]text[/link] = offer a link to an external resource (accessible with the given schema)</li>
   <li>[blog name="name" bloghash="base64hash"]description[/blog] = link to all posts in the blog</li>
   <li>[blog name="name" bloghash="base64hash" blogentry="1234"]description[/blog] = link to the specified post in the blog</li>
   <li>[blog name="name" bloghash="base64hash" blogtag="tag"]description[/blog] = link to all posts in the blog with the specified tag</li>
   <li>[blog name="name" blogtag="tag"]description[/blog] = link to all posts in all blogs with the specified tag</li>
-  <li>[link schema="eep" location="http://forum.i2p"]text[/link] = offer a link to an external resource (accessible with the given schema)</li>
   <li>[archive name="name" description="they have good stuff" schema="eep" location="http://syndiemedia.i2p/archive/archive.txt"]foo![/archive] = offer an easy way to sync up with a new Syndie archive</li>
 </ul>
 SML headers are newline delimited key:value pairs.  Example keys are: