Index: trunk/kernel/include/emailmessage.php
===================================================================
diff -u -N -r561 -r701
--- trunk/kernel/include/emailmessage.php	(.../emailmessage.php)	(revision 561)
+++ trunk/kernel/include/emailmessage.php	(.../emailmessage.php)	(revision 701)
@@ -501,7 +501,7 @@
         if (!$use_parent) {
 	        $edit_table = $objSession->GetEditTable($this->SourceTable);
 	        @$this->adodbConnection->Execute("DROP TABLE IF EXISTS $edit_table");
-	        $query = "SELECT * FROM ".$this->SourceTable." WHERE $idfield = -1";
+	        $query = "SELECT * FROM ".$this->SourceTable." WHERE 0";
 	        $insert = "CREATE TABLE ".$edit_table." ".$query;
 	        if($objSession->HasSystemPermission("DEBUG.LIST"))
 	            echo htmlentities($insert,ENT_NOQUOTES)."<br>\n";
@@ -519,7 +519,7 @@
 	                  $e->UnsetIdField();
 	                  $e->Set("EmailMessageId",$idvalue--);
 	                  $e->Set("LanguageId",$id);                  
-	                  $e->Set("Description",admin_language("la_desc_emailevent_".$e->Get("Event"),$id));           
+//	                  $e->Set("Description",admin_language("la_desc_emailevent_".$e->Get("Event"),$id));           
 	                  $e->Create();                  
 	              }
 	            }
@@ -528,7 +528,7 @@
 	                $e->UnsetIdField();
 	                $e->Set("EmailMessageId",$idvalue--);
 	                $e->Set("LanguageId",$IdList);
-	                $e->Set("Description",admin_language("la_desc_emailevent_".$e->Get("Event"),$LangId));           
+//	                $e->Set("Description",admin_language("la_desc_emailevent_".$e->Get("Event"),$LangId));           
 	                $e->Create();
 	            }
 	        }
@@ -542,6 +542,7 @@
     function CopyFromEditTable()
     {
         global $objSession;
+		$GLOBALS['_CopyFromEditTable']=1;
 
         $idfield = "EmailMessageId";
         $edit_table = $objSession->GetEditTable($this->SourceTable);
@@ -568,6 +569,7 @@
             $rs->MoveNext();
         }
         @$this->adodbConnection->Execute("DROP TABLE IF EXISTS $edit_table");
+		unset($GLOBALS['_CopyFromEditTable']);
     }
 
     function PurgeEditTable()