diff --git a/Vector/Model/Room/RoomEmailInvitation.h b/Vector/Model/Room/RoomEmailInvitation.h
index 40b674481..813fc29ec 100644
--- a/Vector/Model/Room/RoomEmailInvitation.h
+++ b/Vector/Model/Room/RoomEmailInvitation.h
@@ -22,11 +22,6 @@
  */
 @interface RoomEmailInvitation : NSObject
 
-/**
- The room in the invitation.
- */
-@property (nonatomic, readonly) NSString *roomId; // TODO
-
 /**
  The invitation parameters.
  Can be nil.
diff --git a/Vector/Model/Room/RoomPreviewData.m b/Vector/Model/Room/RoomPreviewData.m
index a5a949e1f..9cb8308bd 100644
--- a/Vector/Model/Room/RoomPreviewData.m
+++ b/Vector/Model/Room/RoomPreviewData.m
@@ -35,6 +35,10 @@
     if (self)
     {
         _emailInvitation = [[RoomEmailInvitation alloc] initWithParams:emailInvitationParams];
+
+        // Report decoded data
+        _roomName = _emailInvitation.roomName;
+        _roomAvatarUrl = _emailInvitation.roomAvatarUrl;
     }
     return self;
 }
diff --git a/Vector/ViewController/RoomViewController.m b/Vector/ViewController/RoomViewController.m
index 0b9d7e899..60dd66529 100644
--- a/Vector/ViewController/RoomViewController.m
+++ b/Vector/ViewController/RoomViewController.m
@@ -719,7 +719,7 @@
             }
             else if (roomPreviewData)
             {
-                previewHeader.emailInvitation = roomPreviewData.emailInvitation; //TODO
+                previewHeader.roomPreviewData = roomPreviewData;
 
                 if (roomPreviewData.emailInvitation.email)
                 {
@@ -760,12 +760,12 @@
             
             shadowImage = [[UIImage alloc] init];
 
-            // Set the avatar provided by the email invitation
-            if (roomPreviewData.emailInvitation.roomAvatarUrl)
+            // Set the avatar provided in preview data
+            if (roomPreviewData.roomAvatarUrl)
             {
                 RoomAvatarTitleView *roomAvatarTitleView = (RoomAvatarTitleView*)self.titleView;
                 MXKImageView *roomAvatarView = roomAvatarTitleView.roomAvatar;
-                NSString *roomAvatarUrl = [self.mainSession.matrixRestClient urlOfContentThumbnail:roomPreviewData.emailInvitation.roomAvatarUrl toFitViewSize:roomAvatarView.frame.size withMethod:MXThumbnailingMethodCrop];
+                NSString *roomAvatarUrl = [self.mainSession.matrixRestClient urlOfContentThumbnail:roomPreviewData.roomAvatarUrl toFitViewSize:roomAvatarView.frame.size withMethod:MXThumbnailingMethodCrop];
 
                 roomAvatarTitleView.roomAvatarURL = roomAvatarUrl;
             }