diff --git a/apps/susimail/src/src/org/mortbay/servlet/MultiPartRequest.java b/apps/susimail/src/src/org/mortbay/servlet/MultiPartRequest.java
index 64f5010914..c6987ebaef 100644
--- a/apps/susimail/src/src/org/mortbay/servlet/MultiPartRequest.java
+++ b/apps/susimail/src/src/org/mortbay/servlet/MultiPartRequest.java
@@ -29,7 +29,8 @@ import javax.servlet.http.HttpServletRequest;
 
 //import org.apache.commons.logging.Log;
 //import org.mortbay.log.LogFactory;
-import org.eclipse.jetty.util.MultiMap;
+//import org.eclipse.jetty.util.MultiMap;
+import org.mortbay.util.MultiMap;
 import org.mortbay.util.LineInput;
 
 /* ------------------------------------------------------------ */
diff --git a/apps/susimail/src/src/org/mortbay/util/MultiMap.java b/apps/susimail/src/src/org/mortbay/util/MultiMap.java
new file mode 100644
index 0000000000..2a16cf5206
--- /dev/null
+++ b/apps/susimail/src/src/org/mortbay/util/MultiMap.java
@@ -0,0 +1,45 @@
+package org.mortbay.util;
+
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
+public class MultiMap<T>
+{
+    HashMap<T, LinkedList<Object>> data;
+     
+	public MultiMap(int i)
+	{
+	    data = new HashMap<T, LinkedList<Object>>();
+	}
+
+	public Set<T> keySet()
+	{
+		return data.keySet();
+	}
+
+	public Object get(T key)
+	{
+		List<Object> tmp = getValues(key);
+		
+		return tmp != null ? tmp.get( 0 ) : null;
+	}
+
+	public List<Object> getValues(T key)
+	{
+		return data.get( key );
+	}
+
+	public void add(T key, Object value )
+	{
+		LinkedList<Object> list = data.get( key );
+		
+		if( list == null ) {
+			list = new LinkedList<Object>();
+			data.put( key, list );
+		}
+		
+		list.add( value );
+	}
+}
diff --git a/history.txt b/history.txt
index 71e8df5a38..60a6c57393 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,7 @@
+2014-03-05 str4d
+ * susimail: Removed remaining Jetty dependencies in susimail
+   (patch from wockenfuss) (ticket #1165)
+
 2014-02-24 zzz
  * NetDB: Slow down router refresh after startup to reduce load
    on exploratory tunnels
@@ -10,7 +14,8 @@
  * Tunnels: Rate-limit connections at the OBEP (ticket #1134)
 
 2014-02-23 dg
- * I2PTunnel: add 'irc.dg.i2p' to the default IRC2P tunnel (for more information, see http://echelon.i2p/docs/IRC2p/irc2p_userguide.txt)
+ * I2PTunnel: add 'irc.dg.i2p' to the default IRC2P tunnel (for more
+   information, see http://echelon.i2p/docs/IRC2p/irc2p_userguide.txt)
 
 2014-02-21 zzz
  * Build: Add property for target version