diff --git a/UI/MailPartViewers/English.lproj/Localizable.strings b/UI/MailPartViewers/English.lproj/Localizable.strings
index 0dc15af12..639649d86 100644
--- a/UI/MailPartViewers/English.lproj/Localizable.strings
+++ b/UI/MailPartViewers/English.lproj/Localizable.strings
@@ -47,3 +47,4 @@ reply_info = "This is a reply to an event invitation done by you.";
 "OK" = "OK";
 "Comment" = "Comment";
 "Description" = "Description";
+"Location" = "Location";
diff --git a/UI/MailPartViewers/French.lproj/Localizable.strings b/UI/MailPartViewers/French.lproj/Localizable.strings
index f1dd5b2ef..6a05a0158 100644
--- a/UI/MailPartViewers/French.lproj/Localizable.strings
+++ b/UI/MailPartViewers/French.lproj/Localizable.strings
@@ -47,3 +47,4 @@ reply_info = "Ceci est une réponse à un événement que vous avez organisé.";
 "OK" = "Ok";
 "Comment" = "Description :";
 "Description" = "Description";
+"Location" = "Lieu";
diff --git a/UI/MailPartViewers/UIxMailPartICalViewer.h b/UI/MailPartViewers/UIxMailPartICalViewer.h
index 7ecc4a394..1ffde026e 100644
--- a/UI/MailPartViewers/UIxMailPartICalViewer.h
+++ b/UI/MailPartViewers/UIxMailPartICalViewer.h
@@ -44,6 +44,8 @@
 - (NSString *) startDate;
 - (NSString *) startTime;
 - (BOOL) isEndDateOnSameDay;
+- (BOOL) hasLocation;
+- (NSString *)location;
 
 @end
 
diff --git a/UI/MailPartViewers/UIxMailPartICalViewer.m b/UI/MailPartViewers/UIxMailPartICalViewer.m
index 8f900c452..7831900db 100644
--- a/UI/MailPartViewers/UIxMailPartICalViewer.m
+++ b/UI/MailPartViewers/UIxMailPartICalViewer.m
@@ -583,9 +583,19 @@
                                     [[person partStatWithDefault] lowercaseString], @"partstat", nil]];
     }
 
-  [d setObject: a  forKey: @"participants"];
+  [d setObject: a  forKey: @"participants"]; 
 
   return d;
 }
 
+- (BOOL) hasLocation {
+  return [self inEvent] != nil 
+          && [[self inEvent] location] != nil 
+          && [[[self inEvent] location] length] > 0;
+}
+
+- (NSString *) location {
+  return [[self inEvent] location];
+}
+
 @end /* UIxMailPartICalViewer */
diff --git a/UI/Templates/MailPartViewers/UIxMailPartICalViewer.wox b/UI/Templates/MailPartViewers/UIxMailPartICalViewer.wox
index 09c473d84..9547a25dd 100644
--- a/UI/Templates/MailPartViewers/UIxMailPartICalViewer.wox
+++ b/UI/Templates/MailPartViewers/UIxMailPartICalViewer.wox
@@ -264,6 +264,16 @@
           </div>
         </div>
 
+
+        <var:if condition="hasLocation">
+          <div class="pseudo-input-container">
+            <label class="pseudo-input-label"><var:string label:value="Location"/></label>
+            <div>
+              <var:string value="location"/>
+            </div>
+          </div>
+        </var:if>
+
         <!-- ATTENDEES -->
         <md-list ng-show="part.participants.length > 0">
           <div class="pseudo-input-container">