--- /home/greensocs/drupal/sites/all/modules/og2list/mail-in.pl	2007-09-15 09:40:34.504025380 +0200
+++ mail-in.pl	2008-03-06 14:57:43.064338260 +0100
@@ -287,10 +287,16 @@ INSERT INTO og2list_incoming_content
 VALUES (?,?,?,?,?,?);
 EOF
 
+#$add_group_stmt = <<EOF;
+#INSERT INTO og2list_incoming_groups
+#SET mid=(SELECT mid FROM og2list_incoming_content
+#         WHERE msgid=?), oid=(SELECT nid FROM og2list_groups
+#                              WHERE recipient=SUBSTRING_INDEX(?, '\@', 1));
+#EOF
+
 $add_group_stmt = <<EOF;
 INSERT INTO og2list_incoming_groups
-SET mid=(SELECT mid FROM og2list_incoming_content
-         WHERE msgid=?), oid=(SELECT nid FROM og2list_groups
+SET mid=?, oid=(SELECT nid FROM og2list_groups
                               WHERE recipient=SUBSTRING_INDEX(?, '\@', 1));
 EOF
 
@@ -306,11 +312,16 @@ SET status = 5
 WHERE (mid = ?) AND (recipient_address = ?)
 EOF
 
+#$add_attachment_stmt = <<EOF;
+#INSERT INTO og2list_attachment
+#(mid, filename, content_type, payload, disposition)
+#VALUES ((SELECT mid FROM og2list_incoming_content
+#         WHERE msgid=?), ?, ?, ?, ?);
+#EOF
 $add_attachment_stmt = <<EOF;
 INSERT INTO og2list_attachment
 (mid, filename, content_type, payload, disposition)
-VALUES ((SELECT mid FROM og2list_incoming_content
-         WHERE msgid=?), ?, ?, ?, ?);
+VALUES (?, ?, ?, ?, ?);
 EOF
 
 # ----------------------------------------------------------------------
@@ -418,12 +429,16 @@ EOF
 				 $msgid,
 				 $content_type,
 				 $body);
-    $add_group_handle->execute($msgid, $envelope_to);
+    my $mid=$dbh->last_insert_id(undef, undef, undef, undef);
+
+#    $add_group_handle->execute($msgid, $envelope_to);
+    $add_group_handle->execute($mid, $envelope_to);
 
     foreach (keys %attachments) {
        my %attch = %{$attachments{$_}};
 
-       $add_attachment_handle->execute($msgid,
+#       $add_attachment_handle->execute($msgid,
+       $add_attachment_handle->execute($mid,
                                        $attch{'name'},
                                        $attch{'type'},
                                        $attch{'content'},
@@ -436,6 +451,9 @@ EOF
   }
 }
 
+system "/home/greensocs/drupal/sites/cron.csh";
+
+
 # ----------------------------------------------------------------------
 sub save_attachment(@) {
   my $entity = shift;