Index: branches/unlabeled/unlabeled-1.59.2/kernel/include/emailmessage.php
===================================================================
diff -u -r7750 -r8103
--- branches/unlabeled/unlabeled-1.59.2/kernel/include/emailmessage.php	(.../emailmessage.php)	(revision 7750)
+++ branches/unlabeled/unlabeled-1.59.2/kernel/include/emailmessage.php	(.../emailmessage.php)	(revision 8103)
@@ -74,10 +74,10 @@
            			WHERE em.LanguageId = '.$this->Get('LanguageId').' AND e.Event = "COMMON.FOOTER"';
 			$footer = explode("\n\n", $this->Conn->GetOne($sql));
 
-			$email_object = &$this->Application->recallObject('kEmailMessage');
-			$email_object->Clear();
+			$esender =& $this->Application->recallObject('EmailSender');
+			/* @var $esender kEmailSendingHelper */
 
-			$footer = $this->Get('MessageType') == 'text' ? $email_object->convertHTMLtoPlain($footer[1]) : '<br/>'.$footer[1];
+			$footer = $this->Get('MessageType') == 'text' ? $esender->ConvertToText($footer[1]) : '<br/>'.$footer[1];
 
 			$template = $this->Get('Template')."\r\n".$footer;
 			// add footer: end
@@ -120,7 +120,7 @@
         global $objUsers, $objTemplate;
 
         $this->Application->InitParser();
-        
+
         $res = $this->ParseTemplateText($text);
 
         /* parse email class tags */
@@ -904,25 +904,25 @@
     function SendMail($From, $FromName, $ToAddr, $ToName, $Subject, $Text, $Html, $charset, $SendEvent,$FileName="",$FileLoc="",$QueueOnly=0,$extra_headers = array())
     {
 		// $QueueOnly - {true = put in queue, false = nd now}
-    	
+
     	$application =& kApplication::Instance();
-		
+
     	$esender =& $application->recallObject('EmailSender');
 		/* @var $esender kEmailSendingHelper */
-		
+
 		$esender->SetFrom($From, $FromName);
 		$esender->AddTo($ToAddr, $ToName);
-		$esender->SetSubject($Subject); 
+		$esender->SetSubject($Subject);
 		$esender->SetBody(stripslashes($Html), $Text);
-		
+
 		// set additional headers
     	if (is_array($extra_headers)) {
     		foreach ($extra_headers as $header) {
     			$header = explode(':', $header, 2);
     			$esender->SetEncodedHeader(trim($header[0]), trim($header[1]));
     		}
     	}
-    	
+
     	// add attachment if any
 		if (strlen($FileName) > 0) {
 			if(!strlen($FileLoc)) {
@@ -932,17 +932,17 @@
 		}
 
 		$status = $esender->Deliver();
-		
+
 		if ($status) {
-			// write to log	
+			// write to log
 			$fields_hash = Array (
 				'fromuser'	=>	$FromName,
 				'addressto'	=>	$ToName ? $ToName.' ('.$ToAddr.')' : $ToAddr,
 				'subject'	=>	str_replace('Subject:', '', $Subject),
 				'timestamp'	=>	adodb_mktime(),
 				'event'		=>	$SendEvent,
-			);	
-			
+			);
+
 			$db =& $application->GetADODBConnection();
 			$db->doInsert($fields_hash, TABLE_PREFIX.'EmailLog');
 		}
Index: branches/unlabeled/unlabeled-1.3.2/kernel/include/globals.php
===================================================================
diff -u -r7648 -r8103
--- branches/unlabeled/unlabeled-1.3.2/kernel/include/globals.php	(.../globals.php)	(revision 7648)
+++ branches/unlabeled/unlabeled-1.3.2/kernel/include/globals.php	(.../globals.php)	(revision 8103)
@@ -1625,6 +1625,9 @@
 	}
 
   	foreach($main as $vl_key => $vl_value) {
+  		// we need to skip wid here, otherwise empty wid will become 0 and the window name for javascript will be changed (to main_0), 
+		// making all links to original (main) window open in new window
+		if ($vl_key == 'wid') continue;
     	if(!$vl_value) $main[$vl_key] = '0'; // unset($main[$vl_key]);
   	}