diff --git a/lib/db/mysql.php b/lib/db/mysql.php
index 26b9535a99d..46e643528c9 100644
--- a/lib/db/mysql.php
+++ b/lib/db/mysql.php
@@ -1337,6 +1337,31 @@ function main_upgrade($oldversion=0) {
         }
     }
 
+    if ($oldversion < 2005041900) {  // Copy all Dialogue entries into Messages, and hide Dialogue module
+
+        if ($entries = get_records_sql('SELECT e.id, e.userid, c.recipientid, e.text, e.timecreated
+                                          FROM '.$CFG->prefix.'dialogue_conversations c,
+                                               '.$CFG->prefix.'dialogue_entries e
+                                         WHERE e.conversationid = c.id')) {
+            foreach ($entries as $entry) {
+                $message = NULL;
+                $message->useridfrom    = $entry->userid;
+                $message->useridto      = $entry->recipientid;
+                $message->message       = $entry->text;
+                $message->format        = FORMAT_HTML;
+                $message->timecreated   = $entry->timecreated;
+                $message->messagetype   = 'direct';
+            
+                insert_record('message_read', $message);
+            }
+        }
+
+        set_field('modules', 'visible', 0, 'name', 'dialogue');
+
+        notify('The Dialogue module has been disabled, and all the old Messages from it copied into the new standard Message feature.  If you really want Dialogue back, you can enable it using the "eye" icon here:  Admin >> Modules >> Dialogue');
+
+    }
+
     return $result;
 }
 
diff --git a/lib/db/postgres7.php b/lib/db/postgres7.php
index bae8dfda1bc..9b54b56f680 100644
--- a/lib/db/postgres7.php
+++ b/lib/db/postgres7.php
@@ -1053,6 +1053,31 @@ function main_upgrade($oldversion=0) {
         }
     }
 
+    if ($oldversion < 2005041900) {  // Copy all Dialogue entries into Messages, and hide Dialogue module
+
+        if ($entries = get_records_sql('SELECT e.id, e.userid, c.recipientid, e.text, e.timecreated
+                                          FROM '.$CFG->prefix.'dialogue_conversations c,
+                                               '.$CFG->prefix.'dialogue_entries e
+                                         WHERE e.conversationid = c.id')) {
+            foreach ($entries as $entry) {
+                $message = NULL;
+                $message->useridfrom    = $entry->userid;
+                $message->useridto      = $entry->recipientid;
+                $message->message       = $entry->text;
+                $message->format        = FORMAT_HTML;
+                $message->timecreated   = $entry->timecreated;
+                $message->messagetype   = 'direct';
+            
+                insert_record('message_read', $message);
+            }
+        }
+
+        set_field('modules', 'visible', 0, 'name', 'dialogue');
+
+        notify('The Dialogue module has been disabled, and all the old Messages from it copied into the new standard Message feature.  If you really want Dialogue back, you can enable it using the "eye" icon here:  Admin >> Modules >> Dialogue');
+
+    }
+
     return $result;
 }
 
diff --git a/version.php b/version.php
index 010658313c3..88f65a856eb 100644
--- a/version.php
+++ b/version.php
@@ -6,7 +6,7 @@
 // This is compared against the values stored in the database to determine
 // whether upgrades should be performed (see lib/db/*.php)
 
-   $version = 2005041101;  // YYYYMMDD = date 
+   $version = 2005041900;  // YYYYMMDD = date 
                            //       XY = increments within a single day
 
    $release = '1.5 UNSTABLE DEVELOPMENT';    // Human-friendly version name