--- /tmp/gnokii-0.6.0/common/phones/atgen.c	2004-02-22 23:44:27.000000000 +0100
+++ gnokii-0.6.0/common/phones/atgen.c	2004-03-12 17:08:14.000000000 +0100
@@ -395,6 +395,7 @@
 	at_driver_instance *drvinst = AT_DRVINST(state);
 	gn_data tmpdata;
 	gn_error error;
+	char *unicode;
 
 	if (drvinst->charset != AT_CHAR_UNKNOWN)
 		return GN_ERR_NONE;
@@ -404,7 +405,10 @@
 		return error;
 	gn_data_clear(&tmpdata);
 	error = sm_block_no_retry(GN_OP_AT_GetCharset, &tmpdata, state);
-	if (!error && (drvinst->availcharsets & AT_CHAR_UCS2)) {
+	unicode = gn_cfg_get(gn_cfg_info, "global", "unicode");
+	/* Defaults to 'yes' */
+	if ((!unicode || strcmp(unicode, "no"))
+	    && !error && (drvinst->availcharsets & AT_CHAR_UCS2)) {
 		/* UCS2 charset found. try to set it */
 		error = sm_message_send(15, GN_OP_Init, "AT+CSCS=\"UCS2\"\r", state);
 		if (error)