diff --git a/Classes/ChatConversationView.m b/Classes/ChatConversationView.m
index e9d92230b..428ee958b 100644
--- a/Classes/ChatConversationView.m
+++ b/Classes/ChatConversationView.m
@@ -240,6 +240,11 @@ static UICompositeViewDescription *compositeDescription = nil;
                          completion:nil];
     }
 	[self configureForRoom:self.editing];
+	
+	// Resize the popup table depending on wether ephemeral messages are enabled or not.
+	CGRect popupFrame = _popupMenu.frame;
+	popupFrame.size.height = 44 * [_popupMenu numberOfRowsInSection:0];
+	_popupMenu.frame = popupFrame;
 
 }
 
@@ -1573,6 +1578,8 @@ void on_chat_room_conference_alert(LinphoneChatRoom *cr, const LinphoneEventLog
 	_popupMenu.layer.shadowRadius = 10;
 	_popupMenu.layer.masksToBounds = false;
 	_toggleMenuButton.hidden = false;
+	_popupMenu.tableFooterView = [UIView new];
+	[_popupMenu reloadData];
 }
 
 -(void) tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
diff --git a/Classes/LinphoneCoreSettingsStore.m b/Classes/LinphoneCoreSettingsStore.m
index 20986dc37..4b7128750 100644
--- a/Classes/LinphoneCoreSettingsStore.m
+++ b/Classes/LinphoneCoreSettingsStore.m
@@ -344,6 +344,7 @@
         [self setInteger:maxSize forKey:@"auto_download_incoming_files_max_size"];
 		[self setBool:[VFSUtil vfsEnabledWithGroupName:kLinphoneMsgNotificationAppGroupId] forKey:@"vfs_enabled_mode"];
 		[self setBool:[lm lpConfigBoolForKey:@"auto_write_to_gallery_preference" withDefault:YES] forKey:@"auto_write_to_gallery_mode"];
+		[self setBool:[lm lpConfigBoolForKey:@"ephemeral_feature" withDefault:NO] forKey:@"ephemeral_feature"];
 	}
 
 	// network section
@@ -806,6 +807,7 @@
 			}
 		}
 		[lm lpConfigSetBool:[self boolForKey:@"auto_write_to_gallery_mode"] forKey:@"auto_write_to_gallery_preference"];
+		[lm lpConfigSetBool:[self boolForKey:@"ephemeral_feature"] forKey:@"ephemeral_feature"];
 
 		// network section
 		BOOL edgeOpt = [self boolForKey:@"edge_opt_preference"];
diff --git a/Settings/InAppSettings.bundle/Chat.plist b/Settings/InAppSettings.bundle/Chat.plist
index d5e3c9395..a8727c126 100644
--- a/Settings/InAppSettings.bundle/Chat.plist
+++ b/Settings/InAppSettings.bundle/Chat.plist
@@ -60,6 +60,16 @@
 			<key>IASKTextAlignment</key>
 			<string>IASKUITextAlignmentRight</string>
 		</dict>
+		<dict>
+			<key>DefaultValue</key>
+			<false/>
+			<key>Key</key>
+			<string>ephemeral_feature</string>
+			<key>Title</key>
+			<string>Enable ephemeral messages (beta)</string>
+			<key>Type</key>
+			<string>PSToggleSwitchSpecifier</string>
+		</dict>
 		<dict>
 			<key>Type</key>
 			<string>PSGroupSpecifier</string>