diff --git a/SoObjects/Mailer/SOGoTNEFMailBodyPart.m b/SoObjects/Mailer/SOGoTNEFMailBodyPart.m
index 89cab4d1a..d1eaeef2f 100644
--- a/SoObjects/Mailer/SOGoTNEFMailBodyPart.m
+++ b/SoObjects/Mailer/SOGoTNEFMailBodyPart.m
@@ -277,6 +277,7 @@ unsigned char GetRruleMonthNum(unsigned char a, unsigned char b) {
   NSString *partName, *type, *subtype;
   NSString *value, *attendee;
   RTFHandler *handler;
+  NGMimeBodyPart* eventPart;
 
   DWORD signature;
   DDWORD *classification;
@@ -664,9 +665,10 @@ unsigned char GetRruleMonthNum(unsigned char a, unsigned char b) {
               if (debugOn)
                 NSLog(@"TNEF reconstructed vCalendar:\n%@", vcalendar);
 
-              [self bodyPartForData: [vcalendar dataUsingEncoding: NSUTF8StringEncoding]
+              eventPart = [self bodyPartForData: [vcalendar dataUsingEncoding: NSUTF8StringEncoding]
                            withType: @"text"
                          andSubtype: @"calendar"];
+              [self setPart: eventPart];
 
             }
           // Other classes to handle:
diff --git a/UI/MailPartViewers/product.plist b/UI/MailPartViewers/product.plist
index 78cedf99d..6e64aea2d 100644
--- a/UI/MailPartViewers/product.plist
+++ b/UI/MailPartViewers/product.plist
@@ -55,5 +55,14 @@
         };
       };
     };
+    SOGoTNEFMailBodyPart = {
+      methods = {
+        addToCalendar = {
+          protectedBy = "View";
+          actionClass = "UIxMailPartICalActions";
+          actionName  = "addToCalendar";
+        };
+      };
+    };
   };
 }