diff --git a/res/layout-xlarge/message_view_attachment.xml b/res/layout-xlarge/message_view_attachment.xml
index 6e8c16cf4..ddfcaad28 100644
--- a/res/layout-xlarge/message_view_attachment.xml
+++ b/res/layout-xlarge/message_view_attachment.xml
@@ -22,7 +22,6 @@
     android:layout_height="64dip"
     android:orientation="horizontal"
     >
-    <!-- STOPSHIP default icon is not final -->
     <ImageView
         android:id="@+id/attachment_icon"
         android:layout_width="64dip"
diff --git a/res/layout-xlarge/message_view_invitation.xml b/res/layout-xlarge/message_view_invitation.xml
index 4ff3112b0..10b8e418a 100644
--- a/res/layout-xlarge/message_view_invitation.xml
+++ b/res/layout-xlarge/message_view_invitation.xml
@@ -33,7 +33,7 @@
         android:layout_height="64dip"
         android:orientation="horizontal"
         >
-        <!-- STOPSHIP Put icon here -->
+        <!-- TODO: The plan is to show a calendar icon here. -->
         <ImageView
             android:layout_width="64dip"
             android:layout_height="64dip"