diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m
index 9e831c331..532cd295e 100644
--- a/Classes/LinphoneManager.m
+++ b/Classes/LinphoneManager.m
@@ -269,6 +269,15 @@ struct codec_name_pref_table codec_pref_table[] = {{"speex", 8000, "speex_8k_pre
 #endif
 		}
 
+		// by default if handle_content_encoding is not set, we use plain text for debug purposes only
+		if ([self lpConfigStringForKey:@"handle_content_encoding" inSection:@"misc"] == nil) {
+#ifdef DEBUG
+			[self lpConfigSetString:@"none" forKey:@"handle_content_encoding" inSection:@"misc"];
+#else
+			[self lpConfigSetString:@"conflate" forKey:@"handle_content_encoding" inSection:@"misc"];
+#endif
+		}
+
 		[self migrateFromUserPrefs];
 	}
 	return self;
diff --git a/Resources/linphonerc-factory b/Resources/linphonerc-factory
index 6da3ed209..5c5064612 100644
--- a/Resources/linphonerc-factory
+++ b/Resources/linphonerc-factory
@@ -48,12 +48,8 @@ sip_random_port=0
 #by default it is set to 30 by liblinphone
 history_max_size=-1
 
-#whether SIP passwords are to be encrypted in configuration storage file
+#whether SIP passwords must be encrypted in configuration storage file
 store_ha1_passwd=0
-#handle_content_encoding=none
-
-
-
 
 [sound]
 dtmf_player_amp=0.007