diff --git a/SOPE/NGCards/iCalEntityObject.m b/SOPE/NGCards/iCalEntityObject.m
index b61b96cca..e46ac242b 100644
--- a/SOPE/NGCards/iCalEntityObject.m
+++ b/SOPE/NGCards/iCalEntityObject.m
@@ -172,12 +172,12 @@
 
 - (void) setUserComment: (NSString *) _value
 {
-  [[self uniqueChildWithTag: @"usercomment"] setSingleValue: _value forKey: @""];
+  [[self uniqueChildWithTag: @"comment"] setSingleValue: _value forKey: @""];
 }
 
 - (NSString *) userComment
 {
-  return [[self uniqueChildWithTag: @"usercomment"] flattenedValuesForKey: @""];
+  return [[self uniqueChildWithTag: @"comment"] flattenedValuesForKey: @""];
 }
 
 - (void) setStatus: (NSString *) _value
diff --git a/UI/MailPartViewers/English.lproj/Localizable.strings b/UI/MailPartViewers/English.lproj/Localizable.strings
index ad077e872..0dc15af12 100644
--- a/UI/MailPartViewers/English.lproj/Localizable.strings
+++ b/UI/MailPartViewers/English.lproj/Localizable.strings
@@ -46,3 +46,4 @@ reply_info = "This is a reply to an event invitation done by you.";
 "Cancel" = "Cancel";
 "OK" = "OK";
 "Comment" = "Comment";
+"Description" = "Description";
diff --git a/UI/Templates/MailPartViewers/UIxMailPartICalViewer.wox b/UI/Templates/MailPartViewers/UIxMailPartICalViewer.wox
index dfb456b8e..09c473d84 100644
--- a/UI/Templates/MailPartViewers/UIxMailPartICalViewer.wox
+++ b/UI/Templates/MailPartViewers/UIxMailPartICalViewer.wox
@@ -234,10 +234,16 @@
 
         <!-- the user comment is used in replies -->
         <var:if condition="inEvent.userComment.isNotEmpty">
-	  <div class="linked_attachment_meta" style="background-color: white;">
-	    <var:string value="inEvent.userComment" const:insertBR="1" />
-	  </div>
-	  <br />
+          <div class="pseudo-input-container">
+            <label class="pseudo-input-label">
+              <var:string label:value="Comment"/>
+            </label>
+            <div>
+              <md-content>
+                <var:string value="inEvent.userComment.stringByDetectingURLs" const:insertBR="1" const:escapeHTML="NO"/>
+              </md-content>
+            </div>
+          </div>
         </var:if>
 
 
@@ -281,7 +287,7 @@
         <var:if condition="authorativeEvent.comment.isNotEmpty">
           <div class="pseudo-input-container">
             <label class="pseudo-input-label">
-              <var:string label:value="Comment"/>
+              <var:string label:value="Description"/>
             </label>
             <div>
               <md-content>