diff --git a/apps/routerconsole/jsp/help.jsp b/apps/routerconsole/jsp/help.jsp
index 1533f32ff..48520f410 100644
--- a/apps/routerconsole/jsp/help.jsp
+++ b/apps/routerconsole/jsp/help.jsp
@@ -34,7 +34,11 @@ by their binary code license.  This product includes software developed by the A
 
 <p>Another application you can see on this webpage is <a href="http://www.i2p.net/i2ptunnel">I2PTunnel</a>
 (your <a href="i2ptunnel/" target="_blank">web interface</a>) - a GPL'ed application written by mihi that
-lets you tunnel normal TCP/IP traffic over I2P (such as the eepproxy and the irc proxy).</p>
+lets you tunnel normal TCP/IP traffic over I2P (such as the eepproxy and the irc proxy).  There is also a
+<a href="http://susi.i2p/">susimail</a> web based mail client <a href="susimail/susimail">available</a> on
+the console, which is a GPL'ed application written by susi23.  The addressbook application, written by 
+<a href="http://ragnarok.i2p/">Ragnarok</a> helps maintain your hosts.txt files (see ./addressbook/ for
+more information).</p>
 
 <p>The router by default also includes human's public domain <a href="http://www.i2p.net/sam">SAM</a> bridge,
 which other client applications (such the <a href="http://duck.i2p/i2p-bt/">bittorrent port</a>) can use.  
diff --git a/apps/routerconsole/jsp/nav.jsp b/apps/routerconsole/jsp/nav.jsp
index 8fe8c2b6d..6eef7b992 100644
--- a/apps/routerconsole/jsp/nav.jsp
+++ b/apps/routerconsole/jsp/nav.jsp
@@ -17,11 +17,12 @@
 <h4>
  <a href="tunnels.jsp">Tunnels</a> |
  <a href="profiles.jsp">Profiles</a> |
- <a href="netdb.jsp">Network Database</a> |
+ <a href="netdb.jsp">NetDB</a> |
  <a href="logs.jsp">Logs</a> |
- <a href="oldconsole.jsp">Old console</a> |
+ <a href="oldconsole.jsp">Internals</a> |
  <a href="oldstats.jsp">Stats</a> |
- <a href="i2ptunnel/" target="_blank">I2PTunnel</a>
+ <a href="i2ptunnel/" target="_blank">I2PTunnel</a> |
+ <a href="susimail/susimail" target="_blank">Susimail</a>
  <jsp:useBean class="net.i2p.router.web.NavHelper" id="navhelper" scope="request" />
  <jsp:setProperty name="navhelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
  <jsp:getProperty name="navhelper" property="clientAppLinks" />
diff --git a/apps/susimail/build.xml b/apps/susimail/build.xml
new file mode 100644
index 000000000..99f69f6ff
--- /dev/null
+++ b/apps/susimail/build.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project basedir="." default="all" name="susimail">
+    <target name="all" depends="clean, build" />
+    <target name="build" depends="builddep, jar" />
+    <target name="builddep">
+        <ant dir="../jetty/" target="build" />
+    </target>
+    <target name="compile" depends="clean">
+        <javac 
+            srcdir="./src/src"
+            debug="true" deprecation="on" source="1.3" target="1.3" 
+            destdir="./src/WEB-INF/classes">
+            <classpath>
+                <pathelement location="../jetty/jettylib/javax.servlet.jar" />
+                <pathelement location="../jetty/jettylib/org.mortbay.jetty.jar" />
+            </classpath>
+        </javac>
+    </target>
+    <target name="jar" depends="compile, war" />
+    <target name="war" depends="compile">
+        <war destfile="susimail.war" webxml="src/WEB-INF/web.xml"
+             basedir="src/" excludes="WEB-INF/web.xml">
+        </war>
+    </target>
+    <target name="javadoc">
+        <mkdir dir="./build" />
+        <mkdir dir="./build/javadoc" />
+        <javadoc 
+            sourcepath="./src/src/" destdir="./build/javadoc" 
+            packagenames="*" 
+            use="true" 
+            splitindex="true" 
+            windowtitle="susimail" />
+    </target>
+    <target name="clean">
+        <delete>
+            <fileset dir="src/WEB-INF/classes/" includes="**/*.class, susimail.war" />
+        </delete>
+    </target>
+    <target name="cleandep" depends="clean" />
+    <target name="distclean" depends="clean" />
+</project>
diff --git a/build.xml b/build.xml
index 0e29ecc87..2bb14a4a9 100644
--- a/build.xml
+++ b/build.xml
@@ -27,6 +27,7 @@
         <ant dir="apps/systray/java/" target="jar" />
         <ant dir="apps/routerconsole/java/" target="jar" />
         <ant dir="apps/addressbook/" target="war" />
+        <ant dir="apps/susimail/" target="war" />
     </target>
     <target name="buildWEB">
         <ant dir="apps/jetty" target="fetchJettylib" />
@@ -56,6 +57,7 @@
         <copy file="apps/systray/java/build/systray.jar" todir="build/" />
         <copy file="installer/lib/jbigi/jbigi.jar" todir="build" />
         <copy file="apps/addressbook/dist/addressbook.war" todir="build/" />
+        <copy file="apps/susimail/susimail.war" todir="build/" />
     </target>
     <target name="javadoc">
         <mkdir dir="./build" />
@@ -104,6 +106,7 @@
         <ant dir="apps/netmonitor/java/" target="distclean" />
         <ant dir="apps/routerconsole/java/" target="distclean" />
         <ant dir="apps/addressbook/" target="distclean" />
+        <ant dir="apps/susimail/" target="distclean" />
         <ant dir="apps/systray/java/" target="distclean" />
         <ant dir="installer/java/" target="distclean" />
         <delete>
@@ -180,6 +183,7 @@
         <copy file="build/i2ptunnel.war" todir="pkg-temp/webapps/" />
         <copy file="build/routerconsole.war" todir="pkg-temp/webapps/" />
         <copy file="build/addressbook.war" todir="pkg-temp/webapps/" />
+        <copy file="build/susimail.war" todir="pkg-temp/webapps/" />
         <copy file="installer/resources/clients.config" todir="pkg-temp/" />
         <copy file="installer/resources/i2prouter" todir="pkg-temp/" />
         <copy file="installer/resources/i2prouter.bat" todir="pkg-temp/" />
@@ -259,6 +263,7 @@
         <copy file="build/i2ptunnel.war" todir="pkg-temp/webapps/" />
         <copy file="build/routerconsole.war" todir="pkg-temp/webapps/" />
         <copy file="build/addressbook.war" todir="pkg-temp/webapps/" />
+        <copy file="build/susimail.war" todir="pkg-temp/webapps/" />
         <copy file="history.txt" todir="pkg-temp/" />
         <copy file="hosts.txt" todir="pkg-temp/" />
         <mkdir dir="pkg-temp/eepsite" />
diff --git a/history.txt b/history.txt
index 3ceeaf3b1..c544f9a97 100644
--- a/history.txt
+++ b/history.txt
@@ -1,4 +1,7 @@
-$Id: history.txt,v 1.143 2005/02/16 23:08:34 jrandom Exp $
+$Id: history.txt,v 1.144 2005/02/17 12:59:29 jrandom Exp $
+
+2005-02-17  jrandom
+    * Included the GPL'ed susimail 0.13 by default (thanks susi23!)
 
 2005-02-17  jrandom
     * Fixed the braindead tunnel testing logic
diff --git a/readme.html b/readme.html
index 15c6c01c6..2d45824b9 100644
--- a/readme.html
+++ b/readme.html
@@ -21,7 +21,6 @@ listed (if not, <a href="#trouble">see below</a>).  Once those are up, you can:<
          <li><a href="http://forum.i2p/">forum.i2p</a>: a secure and anonymous connection to <a href="http://forum.i2p.net/">forum.i2p.net</a></li>
          <li><a href="http://www.i2p/">www.i2p</a>: a secure and anonymous connection to <a href="http://www.i2p.net/">www.i2p.net</a></li>
          <li><a href="http://dev.i2p/">dev.i2p</a>: a secure and anonymous connection to <a href="http://dev.i2p.net/">dev.i2p.net</a></li>
-         <li><a href="http://fproxy.i2p/">fproxy.i2p</a>: a secure and anonymous connection to a freenet node</li>
      </ul>
      There are many more eepsites - just follow the links from the ones you see,
      bookmark your favorites, and visit them often!</li>
@@ -33,7 +32,9 @@ listed (if not, <a href="#trouble">see below</a>).  Once those are up, you can:<
      of the <a href="http://www.bittorrent.com/">BitTorrent</a> application available.</li>
  <li><b>use anonymous email</b> - postman has created a mail system compatible with normal mail
      clients (POP3 / SMTP) that allows email within I2P as well as mail from and to the normal
-     internet!  get your account at <a href="http://www.postman.i2p/">www.postman.i2p</a>.</li>
+     internet!  get your account at <a href="http://www.postman.i2p/">www.postman.i2p</a>.
+     We bundle <a href="http://susi.i2p/">susimail</a>, a web based anonymity-oriented pop3/smtp client
+     configured to access postman's mail services.</li>
  <li>and lots more</li>
 </ul>
 
@@ -42,8 +43,9 @@ listed (if not, <a href="#trouble">see below</a>).  Once those are up, you can:<
 <p>We've bundled some software to let you run your own eepsite - a 
 <a href="http://jetty.mortbay.org/">Jetty</a> instance listening on 
 <a href="http://localhost:7658/">http://localhost:7658/</a>.  Simply place your files in
-the <code>eepsite/docroot/</code> directory (or any standard JSP/Servlet <code>.war</code>
-files under <code>eepsite/webapps</code>) and they'll show up.  Your eepsite's 
+the <code>eepsite/docroot/</code> directory (or place any standard JSP/Servlet <code>.war</code>
+files under <code>eepsite/webapps</code>, or standard CGI script under <code>eepsite/cgi-bin</code>) 
+and they'll show up.  Your eepsite's 
 <i>destination</i> (which uniquely and securely identifies it) is shown on the I2PTunnel
 <a href="/i2ptunnel/">configuration page</a> - if you want other people to see your eepsite,
 you need to give them that really huge string.  Just paste it into the