diff --git a/ChangeLog b/ChangeLog
index 8cd7fe1ac..f41a82719 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-02-08  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/MailPartViewers/UIxMailPartICalViewer.m
+	([UIxMailPartICalViewer -currentUserAttendee]): new method that
+	returns the current user as an attendee representation in the
+	displayed event, if found.
+
 	* SoObjects/Mailer/SOGoMailAccount.m ([SOGoMailAccount
 	-_urlHostString]): replace "@" with %40 AFTER invoking
 	stringByEscapingURL.
diff --git a/UI/MailPartViewers/UIxMailPartICalViewer.m b/UI/MailPartViewers/UIxMailPartICalViewer.m
index 737e17d27..66df01d20 100644
--- a/UI/MailPartViewers/UIxMailPartICalViewer.m
+++ b/UI/MailPartViewers/UIxMailPartICalViewer.m
@@ -39,6 +39,7 @@
 
 #import <SoObjects/SOGo/SOGoDateFormatter.h>
 #import <SoObjects/SOGo/SOGoUser.h>
+#import <SoObjects/SOGo/iCalEntityObject+Utilities.h>
 #import <SoObjects/Appointments/iCalEntityObject+SOGo.h>
 #import <SoObjects/Appointments/SOGoAppointmentFolder.h>
 #import <SoObjects/Appointments/SOGoAppointmentObject.h>
@@ -349,6 +350,15 @@
   return [attendees objectAtIndex:0];
 }
 
+- (iCalPerson *) currentUserAttendee
+{
+  iCalPerson *currentUser;
+
+  currentUser = [[self storedEvent] findParticipant: [context activeUser]];
+
+  return currentUser;
+}
+
 - (iCalPerson *) storedReplyAttendee
 {
   /*
diff --git a/UI/Templates/MailPartViewers/UIxMailPartICalViewer.wox b/UI/Templates/MailPartViewers/UIxMailPartICalViewer.wox
index e6a9771d0..d4f58af6e 100644
--- a/UI/Templates/MailPartViewers/UIxMailPartICalViewer.wox
+++ b/UI/Templates/MailPartViewers/UIxMailPartICalViewer.wox
@@ -39,21 +39,24 @@
       <var:if condition="inCalendar.method.uppercaseString" const:value="REQUEST">
 	<!-- sent to attendees to propose or update a meeting -->
 	<var:if condition="isLoggedInUserAnAttendee">
-	  <var:if condition="$storedReplyAttendee.partStatWithDefault"
-	    const:value="NEEDS-ACTION" const:negate="YES">
-	    <p class="uix_ical_toolbar" id="iCalendarToolbar">
+	  <p class="uix_ical_toolbar" id="iCalendarToolbar">
+	    <var:if condition="currentUserAttendee.partStatWithDefault"
+	      const:value="ACCEPTED" const:negate="YES">
 	      <input id="iCalendarAccept" class="button"
 		type="button" label:value="Accept"/>
+	    </var:if>
+	    <var:if condition="currentUserAttendee.partStatWithDefault"
+	      const:value="DECLINED" const:negate="YES">
 	      <input id="iCalendarDecline" class="button"
 		type="button" label:value="Decline"/>
-	      <!-- <input id="iCalendarTentative" class="button"
-	      type="button" label:value="Tentative"/> -->
-	      <var:if condition="isEventStoredInCalendar" const:negate="YES">
-		| <input id="iCalendarAddToCalendar" class="button"
-		  type="button" label:value="Add to calendar"/>
-	      </var:if>
-	    </p>
-	  </var:if>
+	    </var:if>
+	    <!-- <input id="iCalendarTentative" class="button"
+	    type="button" label:value="Tentative"/> -->
+	    <var:if condition="isEventStoredInCalendar" const:negate="YES">
+	      | <input id="iCalendarAddToCalendar" class="button"
+		type="button" label:value="Add to calendar"/>
+	    </var:if>
+	  </p>
 
 	  <p>
 	    <var:string label:value="Organizer" />