diff --git a/Classes/SettingsView.m b/Classes/SettingsView.m
index d50267a99..dbb548a91 100644
--- a/Classes/SettingsView.m
+++ b/Classes/SettingsView.m
@@ -497,6 +497,9 @@ void update_hash_cbs(LinphoneAccountCreator *creator, LinphoneAccountCreatorStat
 		removeFromHiddenKeys = debugEnabled;
 		[keys addObject:@"send_logs_button"];
 		[keys addObject:@"reset_logs_button"];
+		if ([LinphoneManager.instance lpConfigBoolForKey:@"send_db"]) {
+			[keys addObject:@"send_db_button"];
+		}
 		[Log enableLogs:debugLevel];
 		[LinphoneManager.instance lpConfigSetInt:debugLevel forKey:@"debugenable_preference"];
 	} else if ([@"account_mandatory_advanced_preference" compare:notif.object] == NSOrderedSame) {
@@ -615,6 +618,7 @@ void update_hash_cbs(LinphoneAccountCreator *creator, LinphoneAccountCreatorStat
 	if (!debugEnabled) {
 		[hiddenKeys addObject:@"send_logs_button"];
 		[hiddenKeys addObject:@"reset_logs_button"];
+		[hiddenKeys addObject:@"send_db_button"];
 	}
 
 	[hiddenKeys addObject:@"playback_gain_preference"];
@@ -973,6 +977,8 @@ void update_hash_cbs(LinphoneAccountCreator *creator, LinphoneAccountCreatorStat
 		[errView addAction:defaultAction];
 		[errView addAction:continueAction];
 		[self presentViewController:errView animated:YES completion:nil];
+	} else if ([key isEqual:@"send_db_button"]) {
+		 [self sendEmailWithPrivacyAttachments];
 	}
 }
 
@@ -1029,6 +1035,49 @@ void update_hash_cbs(LinphoneAccountCreator *creator, LinphoneAccountCreatorStat
 
 	[self emailAttachments:attachments];
 }
+
+- (void)sendEmailWithPrivacyAttachments {
+	NSMutableArray *attachments = [[NSMutableArray alloc] initWithCapacity:4];
+
+	// retrieve historydb
+	[attachments addObject:@[
+		[LinphoneManager dataFile:@"linphone_chats.db"],
+		@"application/db",
+		@"linphone-chats-history.db"
+	]];
+	[attachments addObject:@[
+		[LinphoneManager dataFile:@"zrtp_secrets"],
+		@"application/zrtp",
+		@"zrtp_secrets"
+	]];
+	[attachments addObject:@[
+		[LinphoneManager dataFile:@"linphone.db"],
+		@"application/db",
+		@"linphone.db"
+	]];
+	[attachments addObject:@[
+		[LinphoneManager dataFile:@"x3dh.c25519.sqlite3"],
+		@"application/db",
+		@"x3dh.c25519.sqlite3"
+	]];
+
+	if (attachments.count == 0) {
+		UIAlertController *errView = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"Cannot send files", nil)
+																		 message:NSLocalizedString(@"Nothing could be collected from your application, aborting now.", nil)
+																  preferredStyle:UIAlertControllerStyleAlert];
+		
+		UIAlertAction* defaultAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Cancel", nil)
+																style:UIAlertActionStyleDefault
+															  handler:^(UIAlertAction * action) {}];
+		
+		[errView addAction:defaultAction];
+		[self presentViewController:errView animated:YES completion:nil];
+		return;
+	}
+
+	[self emailAttachments:attachments];
+}
+
 - (void)emailAttachments:(NSArray *)attachments {
 	NSString *error = nil;
 #if TARGET_IPHONE_SIMULATOR
diff --git a/Settings/InAppSettings.bundle/Advanced.plist b/Settings/InAppSettings.bundle/Advanced.plist
index 9bfd8c7a0..d2211516c 100644
--- a/Settings/InAppSettings.bundle/Advanced.plist
+++ b/Settings/InAppSettings.bundle/Advanced.plist
@@ -66,6 +66,14 @@
 			<key>Type</key>
 			<string>IASKButtonSpecifier</string>
 		</dict>
+		<dict>
+			<key>Key</key>
+			<string>send_db_button</string>
+			<key>Title</key>
+			<string>Send Databases</string>
+			<key>Type</key>
+			<string>IASKButtonSpecifier</string>
+		</dict>
 		<dict>
 			<key>Title</key>
 			<string>Notifications</string>