diff -uNr expresso-2.2/calendar/inc/class.bocalendar.inc.php expressov2/calendar/inc/class.bocalendar.inc.php
--- expresso-2.2/calendar/inc/class.bocalendar.inc.php	2011-01-25 16:58:06.000000000 -0200
+++ expressov2/calendar/inc/class.bocalendar.inc.php	2011-01-25 17:12:33.000000000 -0200
@@ -2740,7 +2740,9 @@
 	{
 	if(!is_array($event_array))
 		return null;
-	$tmpattach="BEGIN:VCALENDAR\n"
+	$sender = $GLOBALS['phpgw_info']['user']['email']; 
+        $uid_dono = $GLOBALS['phpgw_info']['user']['account_lid'];
+        $tmpattach="BEGIN:VCALENDAR\n"
 	."PRODID:-//Expresso Livre//Calendar//EN\n"
 	."VERSION:1.0\n";
 		foreach ($event_array as $event)
@@ -2786,11 +2788,14 @@
 			$tmpattach.="BEGIN:VEVENT\n"
 			."DTSTART:".$event['start'][year].$start_event_month.$start_event_day."T".$start_event_hour.$start_event_min."00Z\n"
 			."DTEND:".$event[end][year].$end_event_month.$end_event_day."T".$end_event_hour.$end_event_min."00Z\n"
-			."UID:Expresso-".$event[id].$event[uid]."\n"
+			//."UID:Expresso-".$event[id].$event[uid]."\n"
+                        ."UID:Expresso-".$event[id]."@".$uid_dono."\n"
 			."LAST-MODIFIED:".time()."\n"
 			."DESCRIPTION:".$event[description]."\n"
 			."SUMMARY:".$event[title]."\n"
 			."LOCATION:".$event[location]."\n"
+                        ."ORGANIZER;RSVP=TRUE;PARTSTAT=ACCEPTED;ROLE=CHAIR:mailto:".$sender."\n"
+                        ."ATTENDEE;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT:mailto:".$event[ex_participants]."\n"
 			."END:VEVENT"."\n";
 		}
 			$tmpattach.="END:VCALENDAR\n";
@@ -2950,7 +2955,8 @@
 			$mail->Port = $emailadmin['smtpPort'];
 			$mail->From = $GLOBALS['phpgw']->preferences->values['email'];
 			$mail->FromName = $GLOBALS['phpgw_info']['user']['fullname'];
-			$mail->IsHTML(true);
+			//$mail->IsHTML(true);
+                        $mail->IsCalendar(true);
 
 			// Aqui � enviado o email
 			foreach($to_notify as $userid => $statusid) 
@@ -3202,7 +3208,18 @@
 							break;
 					}
 					$mail->AddAddress($to);
-					$mail->Body = $tmpbody;
+					//$mail->Body = $tmpbody;
+                                        $tmpattach_n = $this->create_vcard($GLOBALS['bocalendar']->so->cal->event);
+                                        $tmpattach_a = str_replace("Expresso-","",$tmpattach_n);
+                                        $tmpattach=str_replace("ATTENDEE;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;ROLE=REQPARTICIPANT:mailto:","ATTENDEE;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT:mailto:".$to,$tmpattach_a);
+                                        $mail->Body = "This is a multi-part message in MIME format.";
+                                        $mail->Body .= "\n--01BD3665.3AF0D360\n";
+                                        $mail->Body .= "Content-Type: text/html; charset=\"iso-8859-1\"\nContent-Transfer-Encoding: 8bit\n";
+                                        $mail->Body .= $tmpbody;
+                                        $mail->Body .= "\n--01BD3665.3AF0D360\n";
+                                        $mail->Body.="Content-Type:text/calendar; method=REQUEST; charset=US-ASCII\nContent-Transfer-Encoding:7bit\n\n";
+                                        $mail->Body .= $tmpattach;
+                                        $mail->Body .= "\n--01BD3665.3AF0D360--\n";   
 					$mail->From = $sender;
 					$mail->FromName = $GLOBALS['phpgw_info']['user']['fullname'];
 					$mail->Sender = $mail->From;
@@ -3228,6 +3245,7 @@
 			if(count($to_notify) && $this->ex_participants){
 				$mail->ClearAllRecipients();
 				$var = explode(",",trim($this->ex_participants));
+                                $mail->IsHTML(true);
 				$to = array();
 				if(!$subject) {
 					$details['startdate'] = $GLOBALS['phpgw']->common->show_date($starttime);
diff -uNr expresso-2.2/phpgwapi/inc/class.phpmailer.inc.php expressov2/phpgwapi/inc/class.phpmailer.inc.php
--- expresso-2.2/phpgwapi/inc/class.phpmailer.inc.php	2011-01-25 16:57:21.000000000 -0200
+++ expressov2/phpgwapi/inc/class.phpmailer.inc.php	2011-01-25 17:05:27.000000000 -0200
@@ -243,6 +243,12 @@
      * @param bool $bool
      * @return void
      */
+    function Iscalendar($bool) {
+        if($bool == true)
+            $this->ContentType = "multipart/alternative;\n  boundary=\"01BD3665.3AF0D360\"\n";
+        else
+            $this->ContentType = "text/plain";
+    }
     function IsHTML($bool) {
         if($bool == true)
             $this->ContentType = "text/html";