diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index d038c59e5d..2f608a27b6 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -292,11 +292,10 @@
     ;; Separate patterns with a ';'
     ; HttpProxyExceptions = ".mydomain.com;localhost"
 
-    ;# {emailmodule} {} {Provide llEmail and llGetNextEmail functionality? (requires SMTP server)} {DefaultEmailModule DefaultEmailModule2} none
+    ;# {emailmodule} {} {Provide llEmail and llGetNextEmail functionality? (requires SMTP server)} {DefaultEmailModule} none
     ;; The email module requires some configuration. It needs an SMTP
     ;; server to send mail through.
-    ;; DefaultEmailModule2 is a improved version under test
-    ; emailmodule = DefaultEmailModule2
+    ; emailmodule = DefaultEmailModule
 
     ;# {SpawnPointRouting} {} {Set routing method for Telehub Spawnpoints} {closest random sequence} closest
     ;; SpawnPointRouting adjusts the landing for incoming avatars.
@@ -506,7 +505,6 @@
     ; host_domain_header_from = "127.0.0.1"
 
     ;# {SMTP_SERVER_FROM} {[Startup]emailmodule:DefaultEmailModule2 enabled:true} {SMTP server from name?} {}
-    ; DefaultEmailModule2 only
     ; some smtp servers require a known From email address or will give Error 500 - Envelope from address is not authorised
     ; set to a valid email address that smtp will accept (in some cases must be like SMTP_SERVER_LOGIN)
     ; SMTP_SERVER_FROM = ""
@@ -517,8 +515,7 @@
     ;# {email_max_size} {[Startup]emailmodule:DefaultEmailModule enabled:true} {Maximum total size of email in bytes.} {} 4096
     ; email_max_size = 4096
 
-    ;# {SMTP_SERVER_TLS} {[Startup]emailmodule:DefaultEmailModule2 enabled:true} {SMTP use TLS?} {} false
-    ; DefaultEmailModule2 only
+    ;# {SMTP_SERVER_TLS} {[Startup]emailmodule:DefaultEmailModule enabled:true} {SMTP use TLS?} {} false
     ; SMTP_SERVER_TLS = false
 
     ;# {SMTP_SERVER_HOSTNAME} {[Startup]emailmodule:DefaultEmailModule enabled:true} {SMTP server name?} {} 127.0.0.1
diff --git a/prebuild.xml b/prebuild.xml
index 5e90c7775f..191263db74 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -467,7 +467,6 @@
       <Reference name="XMLRPC" path="../../../bin/"/>
       <Reference name="Nini" path="../../../bin/"/>
       <Reference name="log4net" path="../../../bin/"/>
-      <Reference name="DotNetOpenMail" path="../../../bin/"/>
       <Reference name="Mono.Addins" path="../../../bin/"/>
 
       <Files>
@@ -1625,7 +1624,6 @@
       <Reference name="XMLRPC" path="../../../bin/"/>
       <Reference name="Nini" path="../../../bin/"/>
       <Reference name="log4net" path="../../../bin/"/>
-      <Reference name="DotNetOpenMail" path="../../../bin/"/>
       <Reference name="MailKit"/>
       <Reference name="MimeKit"/>
 
@@ -1691,7 +1689,6 @@
       <Reference name="XMLRPC" path="../../../bin/"/>
       <Reference name="Nini" path="../../../bin/"/>
       <Reference name="log4net" path="../../../bin/"/>
-      <Reference name="DotNetOpenMail" path="../../../bin/"/>
 
       <Files>
         <Match pattern="*.cs" recurse="true">
@@ -3056,7 +3053,6 @@
       <!-- For scripting in funny languages by default -->
       <Reference name="XMLRPC" path="../../../bin/"/>
       <Reference name="log4net" path="../../../bin/"/>
-      <Reference name="DotNetOpenMail" path="../../../bin/"/>
       <Reference name="MailKit"/>
       <Reference name="MimeKit"/>
   
@@ -3177,7 +3173,6 @@
       <!-- For scripting in funny languages by default -->
       <Reference name="XMLRPC" path="../../../bin/"/>
       <Reference name="log4net" path="../../../bin/"/>
-      <Reference name="DotNetOpenMail" path="../../../bin/"/>
 
       <!--
            TODO: this is kind of lame, we basically build a duplicate
diff --git a/prebuild48.xml b/prebuild48.xml
index 7c3da5e127..8d9b66ee9e 100644
--- a/prebuild48.xml
+++ b/prebuild48.xml
@@ -467,7 +467,6 @@
       <Reference name="XMLRPC" path="../../../bin/"/>
       <Reference name="Nini" path="../../../bin/"/>
       <Reference name="log4net" path="../../../bin/"/>
-      <Reference name="DotNetOpenMail" path="../../../bin/"/>
       <Reference name="Mono.Addins" path="../../../bin/"/>
 
       <Files>
@@ -1626,7 +1625,6 @@
       <Reference name="XMLRPC" path="../../../bin/"/>
       <Reference name="Nini" path="../../../bin/"/>
       <Reference name="log4net" path="../../../bin/"/>
-      <Reference name="DotNetOpenMail" path="../../../bin/"/>
       <Reference name="MailKit"/>
       <Reference name="MimeKit"/>
 
@@ -1692,7 +1690,6 @@
       <Reference name="XMLRPC" path="../../../bin/"/>
       <Reference name="Nini" path="../../../bin/"/>
       <Reference name="log4net" path="../../../bin/"/>
-      <Reference name="DotNetOpenMail" path="../../../bin/"/>
 
       <Files>
         <Match pattern="*.cs" recurse="true">
@@ -3057,7 +3054,6 @@
       <!-- For scripting in funny languages by default -->
       <Reference name="XMLRPC" path="../../../bin/"/>
       <Reference name="log4net" path="../../../bin/"/>
-      <Reference name="DotNetOpenMail" path="../../../bin/"/>
       <Reference name="MailKit"/>
       <Reference name="MimeKit"/>
 
@@ -3178,7 +3174,6 @@
       <!-- For scripting in funny languages by default -->
       <Reference name="XMLRPC" path="../../../bin/"/>
       <Reference name="log4net" path="../../../bin/"/>
-      <Reference name="DotNetOpenMail" path="../../../bin/"/>
 
       <!--
            TODO: this is kind of lame, we basically build a duplicate