updated to latest gammu version

73 files changed, 2983 insertions, 766 deletions

diff --git a/gammu/emb/cfg/config.h b/gammu/emb/cfg/config.h
index 1ba6365..62b4fcf 100644
--- a/gammu/emb/cfg/config.h
+++ b/gammu/emb/cfg/config.h
@@ -138,25 +138,25 @@
 //#define GSM_ENABLE_BEEP
 
 /* ---------------------- C language specific --------------------------- */
 
 #ifndef WIN32
 /* are the scandir functions available */
 #  define HAVE_DIRENT_H 1
 #  define HAVE_SCANDIR 1
 #  define HAVE_ALPHASORT 1
 
 #  define HAVE_PTHREAD 1
 #  define HAVE_SYS_IOCTL_H 1
-#  define HAVE_MYSQL_MYSQL_H 1
+//LR #  define HAVE_MYSQL_MYSQL_H 1
 #endif
 
 #define HAVE_ISWSPACE 1
 #define HAVE_TOWLOWER 1
 
 #ifndef WIN32
 /* Will be used Bluez BT stack ? */
 // LR bluetooth disabled
 //#  define GSM_ENABLE_BLUEZ 1
 /* Will be used Affix BT stack ? */
 /* #  undef GSM_ENABLE_AFFIX */
 #endif
diff --git a/gammu/emb/common/common.pro b/gammu/emb/common/common.pro
index 0e719ee..797199b 100644
--- a/gammu/emb/common/common.pro
+++ b/gammu/emb/common/common.pro
@@ -147,24 +147,25 @@ device/serial/ser_djg.c \
 device/irda/irda.c \
 device/devfunc.c \
 protocol/at/at.c \
 protocol/alcatel/alcabus.c \
 protocol/nokia/mbus2.c \
 protocol/nokia/fbus2.c \
 protocol/nokia/phonet.c \
 protocol/obex/obex.c \
 protocol/symbian/mrouter.c \
 phone/pfunc.c \
 phone/at/atgen.c \
 phone/at/siemens.c \
+phone/at/samsung.c \
 phone/at/sonyeric.c \
 phone/alcatel/alcatel.c \
 phone/nokia/dct3/n6110.c \
 phone/nokia/dct3/n7110.c \
 phone/nokia/dct3/n9210.c \
 phone/nokia/dct3/dct3func.c \
 phone/nokia/dct4/n3320.c \
 phone/nokia/dct4/n3650.c \
 phone/nokia/dct4/n6510.c \
 phone/nokia/dct4/dct4func.c \
 phone/nokia/nauto.c \
 phone/nokia/nfunc.c \
diff --git a/gammu/emb/common/commonE.pro b/gammu/emb/common/commonE.pro
index a36947b..f5b559d 100644
--- a/gammu/emb/common/commonE.pro
+++ b/gammu/emb/common/commonE.pro
@@ -148,24 +148,25 @@ device/serial/ser_djg.c \
 device/irda/irda.c \
 device/devfunc.c \
 protocol/at/at.c \
 protocol/alcatel/alcabus.c \
 protocol/nokia/mbus2.c \
 protocol/nokia/fbus2.c \
 protocol/nokia/phonet.c \
 protocol/obex/obex.c \
 protocol/symbian/mrouter.c \
 phone/pfunc.c \
 phone/at/atgen.c \
 phone/at/siemens.c \
+phone/at/samsung.c \
 phone/at/sonyeric.c \
 phone/alcatel/alcatel.c \
 phone/nokia/dct3/n6110.c \
 phone/nokia/dct3/n7110.c \
 phone/nokia/dct3/n9210.c \
 phone/nokia/dct3/dct3func.c \
 phone/nokia/dct4/n3320.c \
 phone/nokia/dct4/n3650.c \
 phone/nokia/dct4/n6510.c \
 phone/nokia/dct4/dct4func.c \
 phone/nokia/nauto.c \
 phone/nokia/nfunc.c \
diff --git a/gammu/emb/common/device/bluetoth/bluez.c b/gammu/emb/common/device/bluetoth/bluez.c
index 8a4807e..e7e8adf 100644
--- a/gammu/emb/common/device/bluetoth/bluez.c
+++ b/gammu/emb/common/device/bluetoth/bluez.c
@@ -1,13 +1,22 @@
-/* Based on work by Marcel Holtmann and other authors of Bluez */
+/* Based on some work from Bluez (www.bluez.org)
+ * (C) 2000-2001 Qualcomm Incorporated
+ * (C) 2002-2003 Maxim Krasnyansky <maxk@qualcomm.com>
+ * (C) 2002-2004 Marcel Holtmann <marcel@holtmann.org>
+ * GNU GPL version 2
+ */
+/* based on some Marcel Holtmann work from Gnokii (www.gnokii.org)
+ * (C) 1999-2000 Hugh Blemings & Pavel Janik ml. (C) 2001-2004 Pawel Kot 
+ * GNU GPL version 2 or later
+ */
 
 #include "../../gsmstate.h"
 
 #ifdef GSM_ENABLE_BLUETOOTHDEVICE
 #ifdef GSM_ENABLE_BLUEZ
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <string.h>
 #include <sys/socket.h>
@@ -72,54 +81,54 @@ struct search_context {
 };
 
 static void print_service_desc(void *value, void *user) 
 { 
 	sdp_data_t 	*p = (sdp_data_t *)value; 
 	int 		i = 0, proto = 0, *channel = (int *)user; 
 
 	for (; p; p = p->next, i++) { 
 		switch (p->dtd) { 
 		case SDP_UUID16:
 		case SDP_UUID32:
 		case SDP_UUID128:
-			proto = 1;//sdp_uuid_to_proto(&p->val.uuid);
+			proto = sdp_uuid_to_proto(&p->val.uuid);
 			break;
 		case SDP_UINT8: 
 			if (proto == RFCOMM_UUID) {
 				(*channel) = p->val.uint8;
 				return;
 			}
 			break; 
 		} 
 	} 
 }
 
 void print_access_protos(value, user)
 {
 	sdp_list_t 	*protDescSeq = (sdp_list_t *)value;
 	int		*channel = (int *)user;
 	
 	sdp_list_foreach(protDescSeq,print_service_desc,channel);
 }
 
 static GSM_Error bluetooth_checkdevice(GSM_StateMachine *s, bdaddr_t *bdaddr, struct search_context *context)
 {
 	sdp_session_t			*sess;
-	sdp_list_t			*attrid, *search, *seq, *next, *proto = 0;
-	uint32_t			range = 0x0000ffff;
-	char				str[20];
 	sdp_record_t 			*rec;
+	sdp_list_t			*attrid, *search, *seq, *next, *proto = 0;
 	sdp_data_t			*d;
 	bdaddr_t			interface;
+	uint32_t			range = 0x0000ffff;
 	struct search_context 		subcontext;
+	char				str[20];
 	int				channel,channel2;
 
 	bacpy(&interface,BDADDR_ANY);
 
 	ba2str(bdaddr, str);
 	smprintf(s,"%s\n", str);
 
 	sess = sdp_connect(&interface, bdaddr, SDP_RETRY_IF_BUSY);
 	if (!sess) {
 		dbgprintf("Failed to connect to SDP server on %s: %s\n", str, strerror(errno));
 		return ERR_UNKNOWN;
 	}
@@ -133,63 +142,63 @@ static GSM_Error bluetooth_checkdevice(GSM_StateMachine *s, bdaddr_t *bdaddr, st
 	}
 	sdp_list_free(attrid, 0);
 	sdp_list_free(search, 0);
 
 	channel2 = -1;
 	for (; seq; seq = next) {
 		rec 	= (sdp_record_t *) seq->data;
 		
 		if (channel2 == -1) {		
 			if (!context->tree) {
 				d = sdp_data_get(rec,SDP_ATTR_SVCNAME_PRIMARY);
 			
-				if (false) {
+				if (sdp_get_access_protos(rec,&proto) == 0) {
 					channel = -1;
 					sdp_list_foreach(proto,print_access_protos,&channel);
-					//sdp_list_free(proto,(sdp_free_func_t)sdp_data_free);
+					sdp_list_free(proto,(sdp_free_func_t)sdp_data_free);
 				}
 				smprintf(s,"Channel %i",channel);
 				if (d) smprintf(s," - \"%s\"",d->val.str);
 				smprintf(s,"\n");
 				if (channel2 == -1 && bluetooth_checkservicename(s, d->val.str) == ERR_NONE) {
 					channel2 = channel;			
 				}			
 			}
     			if (sdp_get_group_id(rec,&subcontext.group) != -1) {
 				memcpy(&subcontext, context, sizeof(struct search_context));
 				if (subcontext.group.value.uuid16 != context->group.value.uuid16) bluetooth_checkdevice(s,bdaddr,&subcontext);
 			}
 		}
 
 		next = seq->next;
 		free(seq);
-		//sdp_record_free(rec);
+		sdp_record_free(rec);
 	}
 	sdp_close(sess);
 	
 	if (channel2 != -1) return bluetooth_connect(s, channel2, str);
 	
-	return ERR_UNKNOWN;
+	return ERR_NOTSUPPORTED;
 }
 
 GSM_Error bluetooth_findchannel(GSM_StateMachine *s)
 {
 	inquiry_info			ii[20];
 	uint8_t				count = 0;
 	int				i;
 	struct search_context 		context;
 	GSM_Error			error = ERR_NOTSUPPORTED;
 
 	memset(&context, '\0', sizeof(struct search_context));
-	//sdp_uuid16_create(&(context.group),PUBLIC_BROWSE_GROUP);
+	sdp_uuid16_create(&(context.group),PUBLIC_BROWSE_GROUP);
 
 	if (!strcmp(s->CurrentConfig->Device,"/dev/ttyS1")) {
 		dbgprintf("Searching for devices\n");
 		if (sdp_general_inquiry(ii, 20, 8, &count) < 0) {
 			return ERR_UNKNOWN;
 		}
 	} else {
 		count = 1;
 		str2ba(s->CurrentConfig->Device,&ii[0].bdaddr);
 	}
 	for (i=0;i<count;i++) {
 		error = bluetooth_checkdevice(s,&ii[i].bdaddr,&context);
diff --git a/gammu/emb/common/device/devfunc.c b/gammu/emb/common/device/devfunc.c
index d31ebbf..c58a01f 100644
--- a/gammu/emb/common/device/devfunc.c
+++ b/gammu/emb/common/device/devfunc.c
@@ -1,12 +1,20 @@
+/* Some source from Gnokii (www.gnokii.org)
+ * (C) 1999-2000 Hugh Blemings & Pavel Janik ml. (C) 2001-2004 Pawel Kot 
+ * GNU GPL version 2 or later
+ */
+/* Some source from Minicom (http://alioth.debian.org/projects/minicom)
+ * (C) 1991,1992,1993,1994,1995,1996 by Miquel van Smoorenburg
+ * GNU GPL version 2
+ */
 
 #include <string.h>
 #ifdef WIN32
 #  include <io.h>
 #else
 #  include <errno.h>
 #  include <signal.h>
 #endif
 
 #include "../gsmstate.h"
 
 #ifdef GSM_ENABLE_BLUETOOTHDEVICE
@@ -96,25 +104,25 @@ bool unlock_device(char **lock_file)
 }
 
 #else
 
 #define max_buf_len 	128
 #define lock_path 	"/var/lock/LCK.."
 
 /* Lock the device. Allocated string with a lock name is returned
  * in lock_device
  */
 GSM_Error lock_device(const char* port, char **lock_device)
 {
-#ifndef WIN32
+#if !defined(WIN32) && !defined(DJGPP)
 	char 		*lock_file = NULL;
 	char 		buffer[max_buf_len];
 	const char 	*aux;
 	int 		fd, len;
 	GSM_Error	error = ERR_NONE;
 
 	dbgprintf("Locking device\n");
 
 	aux = strrchr(port, '/');
 	/* Remove leading '/' */
 	if (aux) {
 		aux++;
@@ -209,25 +217,25 @@ failed:
 	free(lock_file);
 	*lock_device = 0;
 	return error;
 #else
 	*lock_device = 0;
 	return ERR_NONE;
 #endif
 }
 
 /* Removes lock and frees memory */
 bool unlock_device(char **lock_file)
 {
-#ifndef WIN32
+#if !defined(WIN32) && !defined(DJGPP)
 	int err;
 
 	if (!lock_file) {
 		dbgprintf("Cannot unlock device\n");
 		return false;
 	}
 	err = unlink(*lock_file);
 	free(*lock_file);
 	*lock_file = NULL;
 	return (err + 1);
 #else
 	return true;
diff --git a/gammu/emb/common/device/irda/irda.c b/gammu/emb/common/device/irda/irda.c
index fef50ac..e680377 100644
--- a/gammu/emb/common/device/irda/irda.c
+++ b/gammu/emb/common/device/irda/irda.c
@@ -1,15 +1,19 @@
 /* (c) 2001-2004 by Marcin Wiacek */
-/* based on some work from Ralf Thelen and MyGnokii */
-/* based on some work from Gnokii and MSDN */
+/* based on some work from Ralf Thelen and MyGnokii (www.mwiacek.com) */
+/* based on some work from MSDN */
+/* based on some work from Gnokii (www.gnokii.org)
+ * (C) 1999-2000 Hugh Blemings & Pavel Janik ml. (C) 2001-2004 Pawel Kot 
+ * GNU GPL version 2 or later
+ */
 
 /* You have to include wsock32.lib library to MS VC project to compile it */
 
 #include "../../gsmstate.h"
 
 #ifdef GSM_ENABLE_IRDADEVICE
 #ifndef DJGPP
 
 #ifndef WIN32
 #  include <stdlib.h>
 #  include <unistd.h>
 #  include <stdio.h>
diff --git a/gammu/emb/common/device/irda/irda_unx.h b/gammu/emb/common/device/irda/irda_unx.h
index 8dbcb97..7a55273 100644
--- a/gammu/emb/common/device/irda/irda_unx.h
+++ b/gammu/emb/common/device/irda/irda_unx.h
@@ -1,13 +1,13 @@
-/* part of irda.h available in Linux kernel source */
+/* part of irda.h available in Linux kernel source (www.kernel.org) */
 
 /*********************************************************************
  *                
  * Filename:      irda.h
  * Version:       
  * Description:   
  * Status:        Experimental.
  * Author:        Dag Brattli <dagb@cs.uit.no>
  * Created at:    Mon Mar  8 14:06:12 1999
  * Modified at:   Sat Dec 25 16:06:42 1999
  * Modified by:   Dag Brattli <dagb@cs.uit.no>
  * 
diff --git a/gammu/emb/common/device/serial/ser_djg.c b/gammu/emb/common/device/serial/ser_djg.c
index ac9d7c8..2524187 100644
--- a/gammu/emb/common/device/serial/ser_djg.c
+++ b/gammu/emb/common/device/serial/ser_djg.c
@@ -2,53 +2,53 @@
 #include "../../gsmstate.h"
 
 #ifdef GSM_ENABLE_SERIALDEVICE
 #ifdef DJGPP
 
 #include "../../gsmcomon.h"
 #include "ser_djg.h"
 
 static GSM_Error serial_close(GSM_StateMachine *s)
 {
     	GSM_Device_SerialData *d = &s->Device.Data.Serial;
 
-	return ERR_NONE;
+	return ERR_NOTIMPLEMENTED;
 }
 
 static GSM_Error serial_open (GSM_StateMachine *s)
 {
     	GSM_Device_SerialData *d = &s->Device.Data.Serial;
     
-    	return ERR_NONE;
+	return ERR_NOTIMPLEMENTED;
 }
 
 static GSM_Error serial_setparity(GSM_StateMachine *s, bool parity)
 {
     	GSM_Device_SerialData *d = &s->Device.Data.Serial;
 
-    	return ERR_NONE;
+	return ERR_NOTIMPLEMENTED;
 }
 
 static GSM_Error serial_setdtrrts(GSM_StateMachine *s, bool dtr, bool rts)
 {
     	GSM_Device_SerialData *d = &s->Device.Data.Serial;
 
-    	return ERR_NONE;
+	return ERR_NOTIMPLEMENTED;
 }
 
 static GSM_Error serial_setspeed(GSM_StateMachine *s, int speed)
 {
     	GSM_Device_SerialData *d = &s->Device.Data.Serial;
 
-    	return ERR_NONE;
+	return ERR_NOTIMPLEMENTED;
 }
 
 static int serial_read(GSM_StateMachine *s, void *buf, size_t nbytes)
 {
     	GSM_Device_SerialData *d = &s->Device.Data.Serial;
 
     	return 0;
 }
 
 static int serial_write(GSM_StateMachine *s, void *buf, size_t nbytes)
 {
     	GSM_Device_SerialData *d = &s->Device.Data.Serial;
diff --git a/gammu/emb/common/device/serial/ser_unx.c b/gammu/emb/common/device/serial/ser_unx.c
index 2a87b11..69c7515 100644
--- a/gammu/emb/common/device/serial/ser_unx.c
+++ b/gammu/emb/common/device/serial/ser_unx.c
@@ -1,47 +1,71 @@
 /* (c) 2002-2004 by Marcin Wiacek */
 /* locking device and settings all speeds by Michal Cihar */
+/* based on some work from Gnokii (www.gnokii.org)
+ * (C) 1999-2000 Hugh Blemings & Pavel Janik ml. (C) 2001-2004 Pawel Kot 
+ * GNU GPL version 2 or later
+ */
 
 #include "../../gsmstate.h"
 
 #ifdef GSM_ENABLE_SERIALDEVICE
 #ifndef WIN32
 #ifndef DJGPP
 
 #include <sys/file.h>
 #include <sys/time.h>
 #include <string.h>
 #include <termios.h>
 #include <errno.h>
 
 #include "../../gsmcomon.h"
 #include "ser_unx.h"
 
+#ifndef O_NONBLOCK
+#  define O_NONBLOCK  0
+#endif
+
+#ifdef __NetBSD__
+#  define FNONBLOCK O_NONBLOCK
+
+#  define  B57600   0010001
+#  define  B115200  0010002
+#  define  B230400  0010003
+#  define  B460800  0010004
+#  define  B500000  0010005
+#  define  B576000  0010006
+#  define  B921600  0010007
+#  define  B1000000 0010010
+#  define  B1152000 0010011
+#  define  B1500000 0010012
+#  define  B2000000 0010013
+#  define  B2500000 0010014
+#  define  B3000000 0010015
+#  define  B3500000 0010016
+#  define  B4000000 0010017
+#endif
+
 static GSM_Error serial_close(GSM_StateMachine *s)
 {
 	GSM_Device_SerialData *d = &s->Device.Data.Serial;
 
 	/* Restores old settings */
 	tcsetattr(d->hPhone, TCSANOW, &d->old_settings);
 
 	/* Closes device */
 	close(d->hPhone);
 
 	return ERR_NONE;
 }
 
-#ifndef O_NONBLOCK
-#  define O_NONBLOCK  0
-#endif
-
 static GSM_Error serial_open (GSM_StateMachine *s)
 {
 	GSM_Device_SerialData   *d = &s->Device.Data.Serial;
 	struct termios	  t;
 	int			    i;
 
 	/* O_NONBLOCK MUST is required to avoid waiting for DCD */
 	d->hPhone = open(s->CurrentConfig->Device, O_RDWR | O_NOCTTY | O_NONBLOCK);
 	if (d->hPhone < 0) {
 		i = errno;
 		GSM_OSErrorInfo(s,"open in serial_open");
 		if (i ==  2) return ERR_DEVICENOTEXIST;		//no such file or directory
@@ -193,39 +217,43 @@ static GSM_Error serial_setspeed(GSM_StateMachine *s, int speed)
 		case 134:	speed2 = B134;		break;
 		case 150:	speed2 = B150;		break;
 		case 200:	speed2 = B200;		break;
 		case 300:	speed2 = B300;		break;
 		case 600:	speed2 = B600;		break;
 		case 1200:	speed2 = B1200;		break;
 		case 1800:	speed2 = B1800;		break;
 		case 2400:	speed2 = B2400;		break;
 		case 4800:	speed2 = B4800;		break;
 		case 9600:	speed2 = B9600;		break;
 		case 19200:	speed2 = B19200;	break;
 		case 38400:	speed2 = B38400;	break;
+#ifdef B57600
 		case 57600:	speed2 = B57600;	break;
 		case 115200:	speed2 = B115200;	break;
 		case 230400:	speed2 = B230400;	break;
 		case 460800:	speed2 = B460800;	break;
+#ifdef B500000
 		case 500000:	speed2 = B500000;	break;
 		case 576000:	speed2 = B576000;	break;
 		case 921600:	speed2 = B921600;	break;
 		case 1000000:	speed2 = B1000000;	break;
 		case 1152000:	speed2 = B1152000;	break;
 		case 1500000:	speed2 = B1500000;	break;
 		case 2000000:	speed2 = B2000000;	break;
 		case 2500000:	speed2 = B2500000;	break;
 		case 3000000:	speed2 = B3000000;	break;
 		case 3500000:	speed2 = B3500000;	break;
 		case 4000000:	speed2 = B4000000;	break;	
+#endif
+#endif
 	}
 
     	/* This should work on all systems because it is done according to POSIX */
     	cfsetispeed(&t, speed2);
     	cfsetospeed(&t, speed2);
 
     	if (tcsetattr(d->hPhone, TCSADRAIN, &t) == -1) {
 		serial_close(s);
 		GSM_OSErrorInfo(s,"tcsetattr in serial_setspeed");
 		return ERR_DEVICECHANGESPEEDERROR;
     	}
 
diff --git a/gammu/emb/common/device/serial/ser_w32.c b/gammu/emb/common/device/serial/ser_w32.c
index 9fa0135..7d88fc7 100644
--- a/gammu/emb/common/device/serial/ser_w32.c
+++ b/gammu/emb/common/device/serial/ser_w32.c
@@ -1,14 +1,18 @@
 /* (c) 2002-2004 by Marcin Wiacek */
-/* based on some work from Gnokii, MSDN and others */
+/* based on some work from MSDN and others */
+/* based on some work from Gnokii (www.gnokii.org)
+ * (C) 1999-2000 Hugh Blemings & Pavel Janik ml. (C) 2001-2004 Pawel Kot 
+ * GNU GPL version 2 or later
+ */
 
 #include "../../gsmstate.h"
 
 #ifdef GSM_ENABLE_SERIALDEVICE
 #ifdef WIN32
 
 #include <windows.h>
 #include <string.h>
 #include <stdio.h>
 #include <io.h>
 #include <memory.h>
 
diff --git a/gammu/emb/common/gsmcomon.c b/gammu/emb/common/gsmcomon.c
index d094ef3..445c3a6 100644
--- a/gammu/emb/common/gsmcomon.c
+++ b/gammu/emb/common/gsmcomon.c
@@ -112,65 +112,66 @@ unsigned char *GetMsg (INI_Section *cfg, unsigned char *default_string)
 	return default_string;
 }
 
 typedef struct {
 	GSM_Error		ErrorNum;
 	unsigned char		*ErrorText;
 } PrintErrorEntry;
 
 static PrintErrorEntry PrintErrorEntries[] = {
 	{ERR_NONE,			"No error."},
 	{ERR_DEVICEOPENERROR,		"Error opening device. Unknown/busy or no permissions."},
 	{ERR_DEVICELOCKED,		"Error opening device. Device locked."},
-	{ERR_DEVICENOTEXIST,		"Error opening device. Not exist."},
+	{ERR_DEVICENOTEXIST,		"Error opening device. Doesn't exist."},
 	{ERR_DEVICEBUSY,		"Error opening device. Already opened by other application."},
 	{ERR_DEVICENOPERMISSION,	"Error opening device. No permissions."},
 	{ERR_DEVICENODRIVER,		"Error opening device. No required driver in operating system."},
 	{ERR_DEVICENOTWORK,		"Error opening device. Some hardware not connected/wrong configured."},
 	{ERR_DEVICEDTRRTSERROR,		"Error setting device DTR or RTS."},
 	{ERR_DEVICECHANGESPEEDERROR,	"Error setting device speed. Maybe speed not supported."},
 	{ERR_DEVICEWRITEERROR,		"Error writing device."},
-	{ERR_DEVICEREADERROR,		"Error during reading device"},
-	{ERR_DEVICEPARITYERROR,		"Can't set parity on device"},
+	{ERR_DEVICEREADERROR,		"Error during reading device."},
+	{ERR_DEVICEPARITYERROR,		"Can't set parity on device."},
 	{ERR_TIMEOUT,			"No response in specified timeout. Probably phone not connected."},
 	/* Some missed */
 	{ERR_UNKNOWNRESPONSE,		"Unknown response from phone. See readme.txt, how to report it."},
 	/* Some missed */
 	{ERR_UNKNOWNCONNECTIONTYPESTRING,"Unknown connection type string. Check config file."},
 	{ERR_UNKNOWNMODELSTRING,	"Unknown model type string. Check config file."},
 	{ERR_SOURCENOTAVAILABLE,	"Some required functions not compiled for your OS. Please contact."},
 	{ERR_NOTSUPPORTED,		"Function not supported by phone."},
 	{ERR_EMPTY,			"Entry is empty"},
 	{ERR_SECURITYERROR,		"Security error. Maybe no PIN ?"},
 	{ERR_INVALIDLOCATION,		"Invalid location. Maybe too high ?"},
 	{ERR_NOTIMPLEMENTED,		"Function not implemented. Help required."},
 	{ERR_FULL,			"Memory full."},
 	{ERR_UNKNOWN,			"Unknown error."},
 	/* Some missed */
 	{ERR_CANTOPENFILE,		"Can't open specified file. Read only ?"},
 	{ERR_MOREMEMORY,		"More memory required..."},
 	{ERR_PERMISSION,		"Permission to file/device required..."},
-	{ERR_EMPTYSMSC,			"Empty SMSC number. Set in phone or use -smscnumber"},
+	{ERR_EMPTYSMSC,			"Empty SMSC number. Set in phone or use -smscnumber."},
 	{ERR_INSIDEPHONEMENU,		"You're inside phone menu (during editing ?). Leave it and try again."},
 	{ERR_WORKINPROGRESS,		"Function is during writing. If want help, please contact with authors."},
-	{ERR_PHONEOFF,			"Phone is disabled and connected to charger"},
-	{ERR_FILENOTSUPPORTED,		"File format not supported by Gammu"},
+	{ERR_PHONEOFF,			"Phone is disabled and connected to charger."},
+	{ERR_FILENOTSUPPORTED,		"File format not supported by Gammu."},
 	{ERR_BUG,			"Nobody is perfect, some bug appeared in protocol implementation. Please contact authors."},
-	{ERR_CANCELED,			"Transfer was canceled by phone (you pressed cancel on phone?)."},
+	{ERR_CANCELED,			"Transfer was canceled by phone (you pressed cancel on phone?)"},
 	/* Some missed */
 	{ERR_OTHERCONNECTIONREQUIRED,	"Current connection type doesn't support called function."},
-	/* Some missed */
+	{ERR_WRONGCRC,			"CRC error."},
 	{ERR_INVALIDDATETIME,		"Invalid date or time specified."},
-	{ERR_MEMORY,			"Phone memory error, maybe it is read only"},
-	{ERR_INVALIDDATA,		"Invalid data"},
+	{ERR_MEMORY,			"Phone memory error, maybe it is read only."},
+	{ERR_INVALIDDATA,		"Invalid data."},
+	{ERR_FILEALREADYEXIST,		"File with specified name already exist."},
 
 	{0,				""}
 };
 
 unsigned char *print_error(GSM_Error e, FILE *df, INI_Section *cfg)
 {
 	unsigned char 	*def 	= NULL;
 	int 		i	= 0;
 
 	while (PrintErrorEntries[i].ErrorNum != 0) {
 		if (PrintErrorEntries[i].ErrorNum == e) {
 			def 	= PrintErrorEntries[i].ErrorText;
diff --git a/gammu/emb/common/gsmcomon.h b/gammu/emb/common/gsmcomon.h
index cd36708..e067955 100644
--- a/gammu/emb/common/gsmcomon.h
+++ b/gammu/emb/common/gsmcomon.h
@@ -57,25 +57,26 @@ typedef enum {
 	ERR_INSIDEPHONEMENU,		/* Inside phone menu - can't make something */
 	ERR_NOTCONNECTED,		/* Phone NOT connected - can't make something */
 	ERR_WORKINPROGRESS,		/* Work in progress */
 	ERR_PHONEOFF,			/* Phone is disabled and connected to charger */
 	ERR_FILENOTSUPPORTED,		/* File format not supported by Gammu */
 	ERR_BUG,                  	/* Found bug in implementation or phone */
     	ERR_CANCELED,                 	/* Action was canceled by user */
 	ERR_NEEDANOTHERANSWER,   	/* Inside Gammu: phone module need to send another answer frame */
 /*40*/	ERR_OTHERCONNECTIONREQUIRED,
 	ERR_WRONGCRC,
 	ERR_INVALIDDATETIME,		/* Invalid date/time */
 	ERR_MEMORY,			/* Phone memory error, maybe it is read only */
-	ERR_INVALIDDATA			/* Invalid data */
+	ERR_INVALIDDATA,		/* Invalid data */
+	ERR_FILEALREADYEXIST		/* File with specified name already exist */
 } GSM_Error;
 
 extern GSM_Error NoneFunction		(void);
 extern GSM_Error NotImplementedFunction	(void);
 extern GSM_Error NotSupportedFunction	(void);
 
 #define NONEFUNCTION 	(void *) NoneFunction
 #define NOTIMPLEMENTED 	(void *) NotImplementedFunction
 #define NOTSUPPORTED 	(void *) NotSupportedFunction
 
 unsigned char *GetMsg 		(INI_Section *cfg, unsigned char *default_string);
 unsigned char *print_error	(GSM_Error e, FILE *df, INI_Section *cfg);
diff --git a/gammu/emb/common/gsmstate.c b/gammu/emb/common/gsmstate.c
index b8f5f89..31e365d 100644
--- a/gammu/emb/common/gsmstate.c
+++ b/gammu/emb/common/gsmstate.c
@@ -177,49 +177,51 @@ GSM_Error GSM_RegisterAllPhoneModules(GSM_StateMachine *s)
 #ifdef GSM_ENABLE_OBEXGEN
 	GSM_RegisterModule(s,&OBEXGENPhone);
 #endif
 #ifdef GSM_ENABLE_MROUTERGEN
 	GSM_RegisterModule(s,&MROUTERGENPhone);
 #endif
 #ifdef GSM_ENABLE_NOKIA3320
 	GSM_RegisterModule(s,&N3320Phone);
 #endif
 #ifdef GSM_ENABLE_NOKIA3650
 	GSM_RegisterModule(s,&N3650Phone);
 #endif
+#ifdef GSM_ENABLE_NOKIA650
+	GSM_RegisterModule(s,&N650Phone);
+#endif
 #ifdef GSM_ENABLE_NOKIA6110
 	GSM_RegisterModule(s,&N6110Phone);
 #endif
 #ifdef GSM_ENABLE_NOKIA6510
 	GSM_RegisterModule(s,&N6510Phone);
 #endif
 #ifdef GSM_ENABLE_NOKIA7110
 	GSM_RegisterModule(s,&N7110Phone);
 #endif
 #ifdef GSM_ENABLE_NOKIA9210
 	GSM_RegisterModule(s,&N9210Phone);
 #endif
 #ifdef GSM_ENABLE_ALCATEL
 	GSM_RegisterModule(s,&ALCATELPhone);
 #endif
 	if (s->Phone.Functions==NULL) return ERR_UNKNOWNMODELSTRING;
 	return ERR_NONE;
 }
 
 GSM_Error GSM_InitConnection(GSM_StateMachine *s, int ReplyNum)
 {
 	GSM_Error	error;
 	GSM_DateTime	time;
 	int		i;
-	char		Buffer[80];
 
 	for (i=0;i<s->ConfigNum;i++) {
 		s->CurrentConfig		  = &s->Config[i];
 
 		s->Speed			  = 0;
 		s->ReplyNum			  = ReplyNum;
 		s->Phone.Data.ModelInfo		  = GetModelData("unknown",NULL,NULL);
 		s->Phone.Data.Manufacturer[0]	  = 0;
 		s->Phone.Data.Model[0]		  = 0;
 		s->Phone.Data.Version[0]	  = 0;
 		s->Phone.Data.VerDate[0]	  = 0;
 		s->Phone.Data.VerNum		  = 0;
@@ -241,36 +243,34 @@ GSM_Error GSM_InitConnection(GSM_StateMachine *s, int ReplyNum)
 		s->LockFile			  = NULL;
 		s->opened			  = false;
 		s->Phone.Functions		  = NULL;
 
 		s->di 				  = di;
 		s->di.use_global 		  = s->CurrentConfig->UseGlobalDebugFile;
 		GSM_SetDebugLevel(s->CurrentConfig->DebugLevel, &s->di);
 		error=GSM_SetDebugFile(s->CurrentConfig->DebugFile, &s->di);
 		if (error != ERR_NONE) return error;
 
 		if (s->di.dl == DL_TEXTALL || s->di.dl == DL_TEXT || s->di.dl == DL_TEXTERROR ||
 	    	    s->di.dl == DL_TEXTALLDATE || s->di.dl == DL_TEXTDATE || s->di.dl == DL_TEXTERRORDATE) {
-			smprintf(s,"[Gammu            - version %s built %s %s]\n",VERSION,__TIME__,__DATE__);
-			smprintf(s,"[Connection       - \"%s\"]\n",s->CurrentConfig->Connection);
+			smprintf(s,"[Gammu            - %s built %s %s",VERSION,__TIME__,__DATE__);
+			if (strlen(GetCompiler()) != 0) {
+				smprintf(s," in %s",GetCompiler());
+			}
+			smprintf(s,"]\n[Connection       - \"%s\"]\n",s->CurrentConfig->Connection);
 			smprintf(s,"[Model type       - \"%s\"]\n",s->CurrentConfig->Model);
 			smprintf(s,"[Device           - \"%s\"]\n",s->CurrentConfig->Device);
-
-			Buffer[0] = 0;
-			if (strlen(GetOS()) != 0) sprintf(Buffer,"%s",GetOS());
-			if (strlen(GetCompiler()) != 0) {
-				if (Buffer[0] != 0) strcat(Buffer+strlen(Buffer),", ");
-				strcat(Buffer+strlen(Buffer),GetCompiler());
+			if (strlen(GetOS()) != 0) {
+				smprintf(s,"[Run on           - %s]\n",GetOS());
 			}
-			if (Buffer[0] != 0) smprintf(s,"[OS/compiler      - %s]\n",Buffer);
 		}
 		if (s->di.dl==DL_BINARY) {
 			smprintf(s,"%c",((unsigned char)strlen(VERSION)));
 			smprintf(s,"%s",VERSION);
 		}
 
 		error=GSM_RegisterAllConnections(s, s->CurrentConfig->Connection);
 		if (error!=ERR_NONE) return error;
 
 		/* Model auto */
 		if (s->CurrentConfig->Model[0]==0) {
 			if (mystrncasecmp(s->CurrentConfig->LockDevice,"yes",0)) {
@@ -545,42 +545,53 @@ GSM_Error GSM_WaitFor (GSM_StateMachine *s, unsigned char *buffer,
         }
 
 	return Phone->DispatchError;
 }
 
 static GSM_Error CheckReplyFunctions(GSM_StateMachine *s, GSM_Reply_Function *Reply, int *reply)
 {
 	GSM_Phone_Data			*Data	  = &s->Phone.Data;
 	GSM_Protocol_Message		*msg	  = s->Phone.Data.RequestMsg;
 	bool				execute;
 	bool				available = false;
 	int				i	  = 0;
+//	int j;
 
 	while (Reply[i].requestID!=ID_None) {
 		execute=false;
 		/* Binary frames like in Nokia */
 		if (strlen(Reply[i].msgtype) < 2) {
 			if (Reply[i].msgtype[0]==msg->Type) {
 				if (Reply[i].subtypechar!=0) {
 					if (Reply[i].subtypechar<=msg->Length) {
 						if (msg->Buffer[Reply[i].subtypechar]==Reply[i].subtype)
 							execute=true;
 					}			
 				} else execute=true;
 			}
 		} else {
+//			printf("msg length %i %i\n",strlen(Reply[i].msgtype),msg->Length);
+			if ((int)strlen(Reply[i].msgtype)<msg->Length) {
+//				printf("Comparing \"%s\" and \"",Reply[i].msgtype);
+//				for (j=0;j<strlen(Reply[i].msgtype);j++) {
+//					if (msg->Buffer[j]!=13 && msg->Buffer[j]!=10) {
+//						printf("%c",msg->Buffer[j]);
+//					}
+//				}
+//				printf("\"\n");
 			if (strncmp(Reply[i].msgtype,msg->Buffer,strlen(Reply[i].msgtype))==0) {
 				execute=true;
 			}
 		}
+		}
 
 		if (execute) {
 			*reply=i;
 			if (Reply[i].requestID == ID_IncomingFrame ||
 			    Reply[i].requestID == Data->RequestID ||
 			    Data->RequestID	== ID_EachFrame) {
 				return ERR_NONE;
 			}
 			available=true;
 		}
 		i++;
 	}
@@ -836,46 +847,49 @@ bool GSM_ReadConfig(INI_Section *cfg_info, GSM_Config *cfg, int num)
 	}
 	cfg->StartInfo   = INI_GetValue(cfg_info, section, "startinfo", 	false);
 	if (!cfg->StartInfo) {
 		free(cfg->StartInfo);
 		cfg->StartInfo	 		 = strdup(DefaultStartInfo);
 	} else {
 		cfg->DefaultStartInfo 		 = false;
 	}
 	return true;
 }
 
 static OnePhoneModel allmodels[] = {
+#ifdef GSM_ENABLE_NOKIA650
+	{"0650" ,"THF-12","",           {0}},
+#endif
 #ifdef GSM_ENABLE_NOKIA6510
 	{"1100", "RH-18" ,"",		{0}},
 	{"1100a","RH-38" ,"",		{0}},
 	{"1100b","RH-36" ,"",		{0}},
 #endif
 #ifdef GSM_ENABLE_NOKIA6110
 	{"2100" ,"NAM-2" ,"",           {F_NOWAP,F_NOCALLER,F_RING_SM,F_CAL33,F_POWER_BATT,F_PROFILES33,F_NOCALLINFO,F_NODTMF,0}},//quess
 #endif
 #ifdef GSM_ENABLE_NOKIA6510
-	{"3100" ,"RH-19" ,"",           {F_PBKTONEGAL,F_PBKSMSLIST,0}},
-	{"3100b","RH-50" ,"",           {F_PBKTONEGAL,F_PBKSMSLIST,0}},
+	{"3100" ,"RH-19" ,"",           {F_PBKTONEGAL,F_PBKSMSLIST,0}},//fixme
+	{"3100b","RH-50" ,"",           {F_PBKTONEGAL,F_PBKSMSLIST,0}},//fixme
 	{"3108", "RH-6",  "Nokia 3108",	{0}}, //does it have irda ?
-	{"3200", "RH-30" ,"Nokia 3200",	{F_PBKTONEGAL,0}},
-	{"3200a","RH-31" ,"Nokia 3200",	{F_PBKTONEGAL,0}},
+	{"3200", "RH-30" ,"Nokia 3200",	{F_PBKTONEGAL,0}},//fixme
+	{"3200a","RH-31" ,"Nokia 3200",	{F_PBKTONEGAL,0}},//fixme
 #endif
 #ifdef GSM_ENABLE_NOKIA6110
 	{"3210" ,"NSE-8" ,"",           {F_NOWAP,F_NOCALLER,F_NOCALENDAR,F_NOPBKUNICODE,F_POWER_BATT,F_PROFILES51,F_NOPICTUREUNI,F_NOCALLINFO,F_NODTMF,0}},
 	{"3210" ,"NSE-9" ,"",           {F_NOWAP,F_NOCALLER,F_NOCALENDAR,F_NOPBKUNICODE,F_POWER_BATT,F_PROFILES51,F_NOPICTUREUNI,F_NOCALLINFO,F_NODTMF,0}},
 #endif
 #ifdef GSM_ENABLE_NOKIA6510
-	{"3300" ,"NEM-1" ,"Nokia 3300", {F_PBKTONEGAL,0}},
-	{"3300" ,"NEM-2" ,"Nokia 3300", {F_PBKTONEGAL,0}},
+	{"3300" ,"NEM-1" ,"Nokia 3300", {F_PBKTONEGAL,0}},//fixme
+	{"3300" ,"NEM-2" ,"Nokia 3300", {F_PBKTONEGAL,0}},//fixme
 #endif
 #ifdef GSM_ENABLE_NOKIA6110
 	{"3310" ,"NHM-5" ,"",           {F_NOWAP,F_NOCALLER,F_RING_SM,F_CAL33,F_POWER_BATT,F_PROFILES33,F_NOCALLINFO,F_NODTMF,0}},
 #endif
 #ifdef GSM_ENABLE_NOKIA3320
 	{"3320" ,"NPC-1" ,"Nokia 3320", {F_CAL62,F_DAYMONTH,0}},//fixme
 #endif
 #ifdef GSM_ENABLE_NOKIA6110
 	{"3330" ,"NHM-6" ,"",           {F_NOCALLER,F_RING_SM,F_CAL33,F_PROFILES33,F_NOPICTUREUNI,F_NOCALLINFO,F_NODTMF,0}},
 	{"3390" ,"NPB-1" ,"",           {F_NOWAP,F_NOCALLER,F_RING_SM,F_CAL33,F_PROFILES33,F_NOPICTUREUNI,F_NOCALLINFO,F_NODTMF,0}},
 	{"3410" ,"NHM-2" ,"",           {F_RING_SM,F_CAL33,F_PROFILES33,F_NOCALLINFO,F_NODTMF,0}},
 #endif
@@ -889,69 +903,75 @@ static OnePhoneModel allmodels[] = {
 #endif
 #ifdef GSM_ENABLE_NOKIA6110
 	{"3610" ,"NAM-1" ,"",           {F_NOCALLER,F_RING_SM,F_CAL33,F_POWER_BATT,F_PROFILES33,F_NOCALLINFO,F_NODTMF,0}},//quess
 #endif
 #if defined(GSM_ENABLE_ATGEN) || defined(GSM_ENABLE_NOKIA3650)
 	{"3650" ,"NHL-8" ,"Nokia 3650", {0}},
 	{"NGAGE","NEM-4" ,"",           {F_RADIO,0}},
 #endif
 #if defined(GSM_ENABLE_ATGEN) || defined(GSM_ENABLE_NOKIA6510)
 	{"5100" ,"NPM-6" ,"Nokia 5100", {F_PBKTONEGAL,F_TODO66,F_RADIO,0}},
 	{"5100" ,"NPM-6U","Nokia 5100", {F_PBKTONEGAL,F_TODO66,F_RADIO,0}},
 	{"5100" ,"NPM-6X","Nokia 5100", {F_PBKTONEGAL,F_TODO66,F_RADIO,0}},
+	{"5140" ,"NPL-4" ,"Nokia 5140", {F_PBKTONEGAL,F_TODO66,F_RADIO,F_PBKUSER,F_WAPMMSPROXY,0}},
+	{"5140" ,"NPL-5" ,"Nokia 5140", {F_PBKTONEGAL,F_TODO66,F_RADIO,F_PBKUSER,F_WAPMMSPROXY,0}},
 #endif
 #ifdef GSM_ENABLE_NOKIA6110
 	{"5110" ,"NSE-1" ,"",           {F_NOWAP,F_NOCALLER,F_NORING,F_NOPICTURE,F_NOSTARTUP,F_NOCALENDAR,F_NOPBKUNICODE,F_PROFILES51,F_MAGICBYTES,F_DISPSTATUS,0}},
 	{"5110i","NSE-2" ,"",           {F_NOWAP,F_NOCALLER,F_NORING,F_NOPICTURE,F_NOSTARTUP,F_NOCALENDAR,F_NOPBKUNICODE,F_PROFILES51,F_MAGICBYTES,F_DISPSTATUS,0}},
 	{"5130" ,"NSK-1" ,"",           {F_NOWAP,F_NOCALLER,F_NORING,F_NOPICTURE,F_NOSTARTUP,F_NOCALENDAR,F_NOPBKUNICODE,F_PROFILES51,F_MAGICBYTES,F_DISPSTATUS,0}},
 	{"5190" ,"NSB-1" ,"",           {F_NOWAP,F_NOCALLER,F_NORING,F_NOPICTURE,F_NOSTARTUP,F_NOCALENDAR,F_NOPBKUNICODE,F_PROFILES51,F_MAGICBYTES,F_DISPSTATUS,0}},
 #endif
 #if defined(GSM_ENABLE_ATGEN) || defined(GSM_ENABLE_NOKIA6110)
 	{"5210" ,"NSM-5" ,"Nokia 5210", {F_CAL52,F_NOSTARTANI,F_NOPICTUREUNI,F_NODTMF,0}},
 #endif
 #ifdef GSM_ENABLE_NOKIA6110
 	{"5510" ,"NPM-5" ,"",           {F_NOCALLER,F_PROFILES33,F_NOPICTUREUNI,0}},
 #endif
 #if defined(GSM_ENABLE_ATGEN) || defined(GSM_ENABLE_NOKIA6510)
 	{"6100" ,"NPL-2" ,"Nokia 6100", {F_PBKTONEGAL,F_TODO66,0}},
 #endif
 #ifdef GSM_ENABLE_NOKIA6110
 	{"6110" ,"NSE-3" ,"",           {F_NOWAP,F_NOPICTURE,F_NOSTARTANI,F_NOPBKUNICODE,F_MAGICBYTES,F_DISPSTATUS,0}},
 	{"6130" ,"NSK-3" ,"",           {F_NOWAP,F_NOPICTURE,F_NOSTARTANI,F_NOPBKUNICODE,F_MAGICBYTES,F_DISPSTATUS,0}},
 	{"6150" ,"NSM-1" ,"",           {F_NOWAP,F_NOSTARTANI,F_NOPBKUNICODE,F_MAGICBYTES,F_DISPSTATUS,F_NOPICTUREUNI,0}},
 	{"6190" ,"NSB-3" ,"",           {F_NOWAP,F_NOPICTURE,F_NOSTARTANI,F_NOPBKUNICODE,F_MAGICBYTES,F_DISPSTATUS,0}},
 #endif
 #if defined(GSM_ENABLE_ATGEN) || defined(GSM_ENABLE_NOKIA6510)
 	{"6200" ,"NPL-3" ,"Nokia 6200", {F_PBKTONEGAL,0}},
-	{"6220" ,"RH-20" ,"Nokia 6220", {F_PBKTONEGAL,F_TODO66,F_RADIO,F_PBKSMSLIST,F_PBKUSER,F_WAPMMSPROXY,0}},
+	{"6220" ,"RH-20" ,"Nokia 6220", {F_PBKTONEGAL,F_TODO66,F_RADIO,F_PBKSMSLIST,F_PBKUSER,F_WAPMMSPROXY,F_NOTES,0}},
 #endif
 #if defined(GSM_ENABLE_ATGEN) || defined(GSM_ENABLE_NOKIA7110)
 	{"6210" ,"NPE-3" ,"Nokia 6210", {F_VOICETAGS,F_CAL62,0}},
 	{"6250" ,"NHM-3" ,"Nokia 6250", {F_VOICETAGS,F_CAL62,0}},
 #endif
 #if defined(GSM_ENABLE_ATGEN) || defined(GSM_ENABLE_NOKIA6510)
-	{"6230" ,"RH-12" ,"Nokia 6230", {F_PBKTONEGAL,F_TODO66,F_RADIO,F_PBKSMSLIST,F_PBKUSER,0}},
+	{"6230" ,"RH-12" ,"Nokia 6230", {F_PBKTONEGAL,F_TODO66,F_RADIO,F_PBKSMSLIST,F_PBKUSER,F_WAPMMSPROXY,F_NOTES,0}},
 	{"6310" ,"NPE-4" ,"Nokia 6310", {F_TODO63,F_CAL65,F_NOMIDI,F_NOMMS,F_VOICETAGS,0}},
 	{"6310i","NPL-1" ,"Nokia 6310i",{F_TODO63,F_CAL65,F_NOMIDI,F_BLUETOOTH,F_NOMMS,F_VOICETAGS,0}},
 	{"6385" ,"NHP-2AX","Nokia 6385",{F_TODO63,F_CAL65,F_NOMIDI,F_NOMMS,F_VOICETAGS,0}},
 	{"6510" ,"NPM-9" ,"Nokia 6510", {F_TODO63,F_CAL65,F_NOMIDI,F_RADIO,F_NOFILESYSTEM,F_NOMMS,F_VOICETAGS,0}},
 	{"6610" ,"NHL-4U","Nokia 6610", {F_PBKTONEGAL,F_TODO66,F_RADIO,0}},
+	{"6610i","RM-37" ,"Nokia 6610i",{F_PBKTONEGAL,F_TODO66,F_RADIO,0}},
 	{"6800" ,"NSB-9" ,"Nokia 6800", {F_PBKTONEGAL,F_TODO66,F_RADIO,F_PBKSMSLIST,0}},
 	{"6800" ,"NHL-6" ,"Nokia 6800", {F_PBKTONEGAL,F_TODO66,F_RADIO,F_PBKSMSLIST,0}},
+	{"6810" ,"RM-2"  ,"Nokia 6810", {F_PBKTONEGAL,F_TODO66,F_RADIO,F_PBKSMSLIST,0}},//quess
+	{"6820" ,"NHL-9" ,"Nokia 6820", {F_PBKTONEGAL,F_TODO66,F_RADIO,F_PBKSMSLIST,0}},//quess
 #endif
 #if defined(GSM_ENABLE_ATGEN) || defined(GSM_ENABLE_NOKIA7110)
 	{"7110" ,"NSE-5" ,"Nokia 7110", {F_CAL62,0}},
 	{"7190" ,"NSB-5" ,"Nokia 7190", {F_CAL62,0}},
 #endif
 #if defined(GSM_ENABLE_ATGEN) || defined(GSM_ENABLE_NOKIA6510)
+	{"7200" ,"RH-23" ,"Nokia 7200", {F_PBKTONEGAL,F_TODO66,F_RADIO,F_PBKSMSLIST,F_PBKUSER,0}},//quess
 	{"7210" ,"NHL-4" ,"Nokia 7210", {F_PBKTONEGAL,F_TODO66,F_RADIO,0}},
 	{"7250" ,"NHL-4J","Nokia 7250", {F_PBKTONEGAL,F_TODO66,F_RADIO,F_PBKIMG,0}},
 	{"7250i","NHL-4JX","Nokia 7250i",{F_PBKTONEGAL,F_TODO66,F_RADIO,F_PBKIMG,0}},
 	{"7600", "NMM-3", "Nokia 7600", {F_TODO66,0}},
 #endif
 #if defined(GSM_ENABLE_ATGEN)
 	{"7650" ,"NHL-2" ,"Nokia 7650", {0}},
 #endif
 #if defined(GSM_ENABLE_ATGEN) || defined(GSM_ENABLE_NOKIA6110)
 	{"8210" ,"NSM-3" ,"Nokia 8210", {F_NOWAP,F_NOSTARTANI,F_NOPBKUNICODE,F_NOPICTUREUNI,0}},
 	{"8250" ,"NSM-3D","Nokia 8250", {F_NOWAP,F_NOSTARTANI,F_CAL82,F_NOPICTUREUNI,0}},
 	{"8290" ,"NSB-7" ,"Nokia 8290", {F_NOWAP,F_NOSTARTANI,F_NOPBKUNICODE,F_NOPICTUREUNI,0}},
@@ -966,53 +986,65 @@ static OnePhoneModel allmodels[] = {
 	{"8890" ,"NSB-6" ,"Nokia 8890", {0}},
 #endif
 #if defined(GSM_ENABLE_ATGEN) || defined(GSM_ENABLE_NOKIA6510)
 	{"8910" ,"NHM-4" ,"Nokia 8910", {F_CAL62,F_NOMIDI,F_NOFILESYSTEM,F_NOMMS,0}},
 	{"8910i","NHM-4" ,"Nokia 8910i",{F_CAL62,F_NOMIDI,F_NOFILESYSTEM,F_NOMMS,0}},
 #endif
 #ifdef GSM_ENABLE_NOKIA9210
 	{"9210" ,"RAE-3" ,"",           {0}},
 	{"9210i","RAE-5" ,"",           {0}},
 #endif
 #ifdef GSM_ENABLE_ATGEN
 	{"at"   ,	  "at",		  "",				   {0}},
+	/* Siemens */
 	{"M20"  ,	  "M20",	  "",				   {F_M20SMS,F_SLOWWRITE,0}},
 	{"MC35" ,	  "MC35",	  "",				   {0}},
+	{"TC35" ,	  "TC35",	  "",				   {0}},
 	{"S25",		  "S25",  	  "SIEMENS S25",		   {0}},
 	{"C35i" ,	  "C35i",	  "",				   {0}},
 	{"S35i" ,	  "S35i",	  "",				   {0}},
 	{"M35i" ,	  "M35i",	  "",				   {0}},
 	{"S40" ,	  "Siemens S40",  "",			   	   {0}},	
 	{"C45" ,	  "C45",	  "",				   {0}},
 	{"S45" ,	  "S45",	  "",				   {0}},
 	{"ME45" ,	  "ME45",	  "",				   {0}},
 	{"SL45" ,	  "SL45",	  "",				   {0}},
 	{"SL45i" ,	  "SL45i",	  "",				   {0}},
 	{"M50" ,	  "M50",	  "",				   {0}},
 	{"S45"	,	  "6618" ,	  "",				   {0}},
 	{"ME45" ,	  "3618" ,	  "",				   {0}},
 	{"S55" ,	  "S55" ,	  "",				   {0}},
+	/* Samsung */
+	{"S100" ,	  "SGH-S100" ,    "",				   {0}},
+	{"S200" ,	  "SGH-S200" ,    "",				   {0}},
+	{"S300" ,	  "SGH-S300" ,    "",				   {0}},
+	{"S500" ,	  "SGH-S500" ,    "",				   {0}},
+	{"V200" ,	  "SGH-V200" ,    "",				   {0}},
+	{"T100" ,	  "SGH-T100" ,    "",				   {0}},
+	{"E700" ,	  "SGH-E700" ,    "",				   {0}},
+	/* Ericsson/Sony Ericsson */
 	{"T28s",	"1101101-BVT28s","",				   {0}},
 	{"R320s" ,	"1101201-BV R320s","",				   {0}},
 	{"R380s",	"7100101-BVR380s" ,"",				   {0}},
 	{"R520m",	"1130101-BVR520m" ,"",				   {0}},
 	{"T39m",	"1130102-BVT39m" ,"",				   {0}},
 	{"T65",		"1101901-BVT65" , "",				   {0}},
 	{"T68",		"1130201-BVT68" , "",				   {0}},
 	{"T68i",	"1130202-BVT68" , "",				   {0}},
 	{"R600",	"102001-BVR600" , "",				   {0}},
 	{"T200",	"1130501-BVT200" ,"",				   {0}},
 	{"T300",	"1130601-BVT300" ,"T300",			   {0}},
 	{"T310",	"1130602-BVT310" ,"",			   	   {0}},	
 	{"P800",	"7130501-BVP800" ,"",				   {0}},
+	/* Other */
 	{"iPAQ" ,	  "iPAQ"  ,	  "" ,				   {0}},
 	{"A2D"  ,	  "A2D"  ,	  "" ,				   {0}},
 	{"9210" ,	  "RAE-3",	  "Nokia Communicator GSM900/1800",{0}},
 	{"myV-65",	"myV-65 GPRS",	  "",				   {F_SMSME900,0}},
 #endif
 #if defined(GSM_ENABLE_ATGEN) || defined(GSM_ENABLE_ALCATEL)
 	{"BE5", 	  "ONE TOUCH 500","",				   {F_ALCATEL,F_SMSONLYSENT,F_BROKENCPBS,0}},
 	{"BH4",		  "ONE TOUCH 535","ALCATEL OT535",		   {F_ALCATEL,F_SMSONLYSENT,0}},
 	{"BF5", 	  "ONE TOUCH 715","ALCATEL OT715",		   {F_ALCATEL,F_SMSONLYSENT,F_BROKENCPBS,0}},
 #endif
 	{"unknown",	  ""      ,"",           {0}}
 };
diff --git a/gammu/emb/common/gsmstate.h b/gammu/emb/common/gsmstate.h
index cb17623..2b4806c 100644
--- a/gammu/emb/common/gsmstate.h
+++ b/gammu/emb/common/gsmstate.h
@@ -1,28 +1,36 @@
 /* (c) 2002-2004 by Marcin Wiacek & Michal Cihar */
 
 #ifndef __gsm_state_h
 #define __gsm_state_h
 
 #include <time.h>
 
 #include "config.h"
 #include "misc/cfg.h"
 
+typedef struct _GSM_StateMachine 	GSM_StateMachine;
+typedef struct _GSM_User	 	GSM_User;
+typedef struct _OnePhoneModel	 	OnePhoneModel;
+typedef struct _GSM_Reply_Function	GSM_Reply_Function;
+
 #ifdef GSM_ENABLE_NOKIA3320
 #  include "phone/nokia/dct4/n3320.h"
 #endif
 #ifdef GSM_ENABLE_NOKIA3650
 #  include "phone/nokia/dct4/n3650.h"
 #endif
+#ifdef GSM_ENABLE_NOKIA650
+#  include "phone/nokia/dct3/n0650.h"
+#endif
 #ifdef GSM_ENABLE_NOKIA6110
 #  include "phone/nokia/dct3/n6110.h"
 #endif
 #ifdef GSM_ENABLE_NOKIA6510
 #  include "phone/nokia/dct4/n6510.h"
 #endif
 #ifdef GSM_ENABLE_NOKIA7110
 #  include "phone/nokia/dct3/n7110.h"
 #endif
 #ifdef GSM_ENABLE_NOKIA9210
 #  include "phone/nokia/dct3/n9210.h"
 #endif
@@ -85,25 +93,25 @@
 #  undef GSM_ENABLE_BLUEPHONET
 #endif
 #ifndef GSM_USED_BLUEAT
 #  undef GSM_ENABLE_BLUEAT
 #endif
 #ifndef GSM_USED_IRDAAT
 #  undef GSM_ENABLE_IRDAAT
 #endif
 #ifndef GSM_USED_MROUTERBLUE
 #  undef GSM_ENABLE_MROUTERBLUE
 #endif
 
-#if defined(GSM_ENABLE_NOKIA3320) || defined(GSM_ENABLE_NOKIA6110) || defined(GSM_ENABLE_NOKIA7110) || defined(GSM_ENABLE_NOKIA9210)
+#if defined(GSM_ENABLE_NOKIA3320) || defined(GSM_ENABLE_NOKIA650) || defined(GSM_ENABLE_NOKIA6110) || defined(GSM_ENABLE_NOKIA7110) || defined(GSM_ENABLE_NOKIA9210)
 #  define GSM_ENABLE_NOKIA_DCT3
 #endif
 #if defined(GSM_ENABLE_NOKIA3650) || defined(GSM_ENABLE_NOKIA6510)
 #  define GSM_ENABLE_NOKIA_DCT4
 #endif
 
 #include "protocol/protocol.h"
 #if defined(GSM_ENABLE_FBUS2) || defined(GSM_ENABLE_FBUS2IRDA) || defined(GSM_ENABLE_FBUS2DLR3) || defined(GSM_ENABLE_FBUS2BLUE) || defined(GSM_ENABLE_BLUEFBUS2) || defined(GSM_ENABLE_FBUS2DKU5) || defined(GSM_ENABLE_FBUS2PL2303)
 #  include "protocol/nokia/fbus2.h"
 #endif
 #ifdef GSM_ENABLE_MBUS2
 #  include "protocol/nokia/mbus2.h"
@@ -190,27 +198,24 @@
 #include "service/gsmring.h"
 #include "service/gsmcal.h"
 #include "service/gsmdata.h"
 #include "service/gsmlogo.h"
 #include "service/gsmmisc.h"
 #include "service/gsmprof.h"
 #include "service/gsmcall.h"
 #include "service/sms/gsmsms.h"
 #include "service/sms/gsmems.h"
 #include "service/sms/gsmmulti.h"
 #include "service/backup/gsmback.h"
 
-typedef struct _GSM_StateMachine GSM_StateMachine;
-typedef struct _GSM_User	 GSM_User;
-typedef struct _OnePhoneModel	 OnePhoneModel;
 
 /* ------------------------- Device layer ---------------------------------- */
 
 /**
  * Device functions, each device has to provide these.
  */
 typedef struct {
 	/**
 	 * Opens device.
 	 */
 	GSM_Error (*OpenDevice)        (GSM_StateMachine *s);
 	/**
@@ -362,24 +367,26 @@ typedef enum {
 	ID_GetFirmware,
 	ID_EnableSecurity,
 	ID_GetIMEI,
 	ID_GetDateTime,
 	ID_GetAlarm,
 	ID_GetMemory,
 	ID_GetMemoryStatus,
 	ID_GetSMSC,
 	ID_GetSMSMessage,
 	ID_EnableEcho,
 	ID_EnableErrorInfo,
 	ID_SetOBEX,
+	ID_SetUSSD,
+	ID_GetNote,
 	ID_GetSignalQuality,
 	ID_GetBatteryCharge,
 	ID_GetSMSFolders,
 	ID_GetSMSFolderStatus,
 	ID_GetSMSStatus,
 	ID_AddSMSFolder,
 	ID_GetNetworkInfo,
 	ID_GetRingtone,
 	ID_DialVoice,
 	ID_GetCalendarNotesInfo,
 	ID_GetCalendarNote,
 	ID_GetSecurityCode,
@@ -429,24 +436,25 @@ typedef enum {
 	ID_GetHardware,
 	ID_GetPPM,
 	ID_GetSMSMode,
 	ID_GetSMSMemories,
 	ID_GetManufacturer,
 	ID_SetMemoryType,
 	ID_SetMemoryCharset,
 	ID_GetMMSSettings,
 	ID_SetSMSParameters,
 	ID_GetFMStation,
 	ID_SetFMStation,
 	ID_GetLanguage,
+	ID_SetFastSMSSending,
 	ID_Reset,
 	ID_GetToDo,
 	ID_PressKey,
 	ID_DeleteAllToDo,
 	ID_SetLight,
 	ID_Divert,
 	ID_SetToDo,
 	ID_PlayTone,
 	ID_GetChatSettings,
 	ID_GetSyncMLSettings,
 	ID_GetSyncMLName,
 	ID_GetSecurityStatus,
@@ -660,24 +668,25 @@ typedef struct {
 	/**
 	 * Used internally by phone drivers.
 	 */
 	unsigned char		*Netmonitor;
 	/**
 	 * Pointer to structure used internally by phone drivers.
 	 */
 	GSM_MultiCallDivert	*Divert;
 	/**
 	 * Pointer to structure used internally by phone drivers.
 	 */
 	GSM_ToDoEntry		*ToDo;
+	GSM_NoteEntry		*Note;
 	/**
 	 * Used internally by phone drivers.
 	 */
 	bool			PressKey;
 	/**
 	 * Pointer to structure used internally by phone drivers.
 	 */
 	GSM_SecurityCodeType	*SecurityStatus;
 	/**
 	 * Pointer to structure used internally by phone drivers.
 	 */
 	GSM_Profile		*Profile;
@@ -761,24 +770,27 @@ typedef struct {
 	
 	/**
 	 * Structure with private phone modules data.
 	 */
 	struct {
 		int			 fake;
 #ifdef GSM_ENABLE_NOKIA3320
 		GSM_Phone_N3320Data	 N3320;
 #endif
 #ifdef GSM_ENABLE_NOKIA3650
 		GSM_Phone_N3650Data	 N3650;
 #endif
+#ifdef GSM_ENABLE_NOKIA650
+		GSM_Phone_N650Data	 N650;
+#endif
 #ifdef GSM_ENABLE_NOKIA6110
 		GSM_Phone_N6110Data	 N6110;
 #endif
 #ifdef GSM_ENABLE_NOKIA6510
 		GSM_Phone_N6510Data	 N6510;
 #endif
 #ifdef GSM_ENABLE_NOKIA7110
 		GSM_Phone_N7110Data	 N7110;
 #endif
 #ifdef GSM_ENABLE_ATGEN
 		GSM_Phone_ATGENData	 ATGEN;
 #endif
@@ -795,49 +807,49 @@ typedef struct {
 } GSM_Phone_Data;
 
 /**
  * Structure for defining reply functions.
  *
  * Function is called when requestID matches current operation or is 
  * ID_IncomingFrame and msgtype matches start message and (if msgtype is just
  * one character) subtypechar is zero or subtypechar-th character of message
  * matches subtype.
  *
  * Should be used in array with last element containing ID_None as requestID.
  */
-typedef struct {
+struct _GSM_Reply_Function {
 	/**
 	 * Pointer to function that should be executed.
 	 */
 	GSM_Error (*Function)	(GSM_Protocol_Message msg, GSM_StateMachine *s);
 	/**
 	 * Message type, if it is longer than 1 character, it disables subtype
 	 * checking.
 	 */
 	unsigned char		*msgtype;
 	/**
 	 * Which character of message should be checked as subtype. Zero to
 	 * disable subtype checking.
 	 */
 	int			subtypechar;
 	/**
 	 * Subtype to be checked.
 	 */
 	unsigned char		subtype;
 	/**
 	 * Phone request when this can be called, use ID_IncomingFrame when
 	 * you want to use this in any state.
 	 */
 	GSM_Phone_RequestID	requestID;
-} GSM_Reply_Function;
+};
 
 /**
  * Structure defining phone functions.
  */
 typedef struct {
 	/**
 	 * Names of supported models separated by |. Must contain at least one
 	 * name.
 	 */
 	char			    	*models;
 	/**
 	 * Array of reply functions for the phone, see 
@@ -1050,24 +1062,25 @@ typedef struct {
 	/**
 	 * Deletes SMS.
 	 */
 	GSM_Error (*DeleteSMS)	  	(GSM_StateMachine *s, GSM_SMSMessage *sms);
 	/**
 	 * Sends SMS.
 	 */
 	GSM_Error (*SendSMS)	    	(GSM_StateMachine *s, GSM_SMSMessage *sms);
 	/**
 	 * Sends SMS already saved in phone.
 	 */
 	GSM_Error (*SendSavedSMS)	(GSM_StateMachine *s, int Folder, int Location);
+	GSM_Error (*SetFastSMSSending)  (GSM_StateMachine *s, bool enable);
 	/**
 	 * Enable/disable notification on incoming SMS.
 	 */
 	GSM_Error (*SetIncomingSMS)     (GSM_StateMachine *s, bool enable);
 	/**
 	 * Gets network information from phone.
 	 */
 	GSM_Error (*SetIncomingCB)      (GSM_StateMachine *s, bool enable);
 	/**
 	 * Returns SMS folders information.
 	 */
 	GSM_Error (*GetSMSFolders)      (GSM_StateMachine *s, GSM_SMSFolders *folders);
@@ -1270,25 +1283,25 @@ typedef struct {
 	GSM_Error (*DeleteAllCalendar)  (GSM_StateMachine *s);
 	/**
 	 * Reads calendar settings.
 	 */
 	GSM_Error (*GetCalendarSettings)(GSM_StateMachine *s, GSM_CalendarSettings *settings);
 	/**
 	 * Sets calendar settings.
 	 */
 	GSM_Error (*SetCalendarSettings)(GSM_StateMachine *s, GSM_CalendarSettings *settings);
 	/**
 	 * Gets note.
 	 */
-	GSM_Error (*GetNote)	    	(GSM_StateMachine *s, GSM_NoteEntry *Note, bool refresh);
+	GSM_Error (*GetNextNote)	(GSM_StateMachine *s, GSM_NoteEntry *Note, bool refresh);
 	/**
 	 * Reads profile.
 	 */
 	GSM_Error (*GetProfile)	 	(GSM_StateMachine *s, GSM_Profile *Profile);
 	/**
 	 * Updates profile.
 	 */
 	GSM_Error (*SetProfile)	 	(GSM_StateMachine *s, GSM_Profile *Profile);
 	/**
 	 * Reads FM station.
 	 */
 	GSM_Error (*GetFMStation)       (GSM_StateMachine *s, GSM_FMStation *FMStation);
@@ -1335,24 +1348,27 @@ typedef struct {
 } GSM_Phone_Functions;
 
 	extern GSM_Phone_Functions NAUTOPhone;
 #ifdef GSM_ENABLE_NOKIA3320
 	extern GSM_Phone_Functions N3320Phone;
 #endif
 #ifdef GSM_ENABLE_NOKIA3650
 	extern GSM_Phone_Functions N3650Phone;
 #endif
 #ifdef GSM_ENABLE_NOKIA6110
 	extern GSM_Phone_Functions N6110Phone;
 #endif
+#ifdef GSM_ENABLE_NOKIA650
+	extern GSM_Phone_Functions N650Phone;
+#endif
 #ifdef GSM_ENABLE_NOKIA6510
 	extern GSM_Phone_Functions N6510Phone;
 #endif
 #ifdef GSM_ENABLE_NOKIA7110
 	extern GSM_Phone_Functions N7110Phone;
 #endif
 #ifdef GSM_ENABLE_NOKIA9210
 	extern GSM_Phone_Functions N9210Phone;
 #endif
 #ifdef GSM_ENABLE_ATGEN
 	extern GSM_Phone_Functions ATGENPhone;
 #endif
@@ -1514,24 +1530,25 @@ typedef enum {
 	F_NOMIDI,	/* No ringtones in MIDI						*/
 	F_BLUETOOTH,	/* Bluetooth support						*/
 	F_NOFILESYSTEM,	/* No images, ringtones, java saved in special filesystem	*/
 	F_NOMMS,	/* No MMS sets in phone						*/
 	F_NOGPRSPOINT,	/* GPRS point are not useable					*/
 	F_CAL35,	/* Calendar,3510 style - Reminder,Call,Birthday			*/
 	F_CAL65,	/* Calendar,6510 style - CBMM, method 3				*/
 	F_WAPMMSPROXY,	/* WAP & MMS settings contains first & second proxy		*/
 
 	/* n6510.c && n7110.c */
 	F_VOICETAGS,	/* Voice tags available						*/
 	F_CAL62,	/* Calendar,6210 style - Call,Birthday,Memo,Meeting		*/
+	F_NOTES,
 
 	/* AT modules */
 	F_SMSONLYSENT,	/* Phone supports only sent/unsent messages			*/
 	F_BROKENCPBS, 	/* CPBS on some memories can hang phone				*/
 	F_M20SMS,	/* Siemens M20 like SMS handling				*/
 	F_SLOWWRITE,	/* Use slower writing which some phone need			*/
 	F_SMSME900,	/* SMS in ME start from location 900 - case of Sagem		*/
 	F_ALCATEL	/* Phone supports Alcatel protocol				*/
 } Feature;
 
 /* For models table */
 struct _OnePhoneModel {
diff --git a/gammu/emb/common/misc/coding/coding.c b/gammu/emb/common/misc/coding/coding.c
index 62543ac..b30b645 100644
--- a/gammu/emb/common/misc/coding/coding.c
+++ b/gammu/emb/common/misc/coding/coding.c
@@ -1,30 +1,183 @@
 /* (c) 2002-2004 by Marcin Wiacek, Michal Cihar and others */
-/* based on some work from MyGnokii and Gnokii */
+/* based on some work from MyGnokii (www.mwiacek.com) */
+/* based on some work from Gnokii (www.gnokii.org)
+ * (C) 1999-2000 Hugh Blemings & Pavel Janik ml. (C) 2001-2004 Pawel Kot 
+ * GNU GPL version 2 or later
+ */
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 #include <locale.h>
 #ifndef __OpenBSD__
 #  include <wctype.h>
 #endif
 #ifdef WIN32
 #  include "windows.h"
 #endif
 
 #include "../misc.h"
 #include "coding.h"
 
+/* function changes #10 #13 chars to \n \r */
+char *EncodeUnicodeSpecialChars(unsigned char *buffer)
+{
+	int 			Pos=0, Pos2=0;
+	static unsigned char	Buf[20000];
+
+	while (buffer[Pos*2]!=0x00 || buffer[Pos*2+1]!=0x00) {
+		if (buffer[Pos*2] == 0x00 && buffer[Pos*2+1] == 10) {
+			Buf[Pos2*2]   = 0x00;
+			Buf[Pos2*2+1] = '\\';
+			Pos2++;
+			Buf[Pos2*2]   = 0x00;
+			Buf[Pos2*2+1] = 'n';
+			Pos2++;
+		} else if (buffer[Pos*2] == 0x00 && buffer[Pos*2+1] == 13) {
+			Buf[Pos2*2]   = 0x00;
+			Buf[Pos2*2+1] = '\\';
+			Pos2++;
+			Buf[Pos2*2]   = 0x00;
+			Buf[Pos2*2+1] = 'r';
+			Pos2++;
+		} else if (buffer[Pos*2] == 0x00 && buffer[Pos*2+1] == '\\') {
+			Buf[Pos2*2]   = 0x00;
+			Buf[Pos2*2+1] = '\\';
+			Pos2++;
+			Buf[Pos2*2]   = 0x00;
+			Buf[Pos2*2+1] = '\\';
+			Pos2++;
+		} else {
+			Buf[Pos2*2]   = buffer[Pos*2];
+			Buf[Pos2*2+1] = buffer[Pos*2+1];
+			Pos2++;
+		}
+		Pos++;
+	}
+	Buf[Pos2*2]   = 0;
+	Buf[Pos2*2+1] = 0;
+	return Buf;
+}
+
+/* function changes #10 #13 chars to \n \r */
+char *EncodeSpecialChars(unsigned char *buffer)
+{
+	int 			Pos=0, Pos2=0;
+	static unsigned char	Buf[10000];
+
+	while (buffer[Pos]!=0x00) {
+		switch (buffer[Pos]) {
+		case 10:
+			Buf[Pos2++] = '\\';
+			Buf[Pos2++] = 'n';
+			break;
+		case 13: 
+			Buf[Pos2++] = '\\';
+			Buf[Pos2++] = 'r';
+			break;
+		case '\\':
+			Buf[Pos2++] = '\\';
+			Buf[Pos2++] = '\\';
+			break;
+		default:
+			Buf[Pos2++] = buffer[Pos];
+		}
+		Pos++;
+	}
+	Buf[Pos2] = 0;
+	return Buf;
+}
+
+char *DecodeUnicodeSpecialChars(unsigned char *buffer)
+{
+	int 			Pos=0, Pos2=0, level=0;
+	static unsigned char	Buf[10000];
+
+	while (buffer[Pos*2]!=0x00 || buffer[Pos*2+1]!=0x00) {
+		Buf[Pos2*2]   = buffer[Pos*2];
+		Buf[Pos2*2+1] = buffer[Pos*2+1];
+		switch (level) {
+		case 0:
+			if (buffer[Pos*2] == 0x00 && buffer[Pos*2+1] == '\\') {
+				level = 1;
+			} else {
+				Pos2++;
+			}
+			break;
+		case 1:
+			if (buffer[Pos*2] == 0x00 && buffer[Pos*2+1] == 'n') {
+				Buf[Pos2*2]   = 0;
+				Buf[Pos2*2+1] = 10;
+			}
+			if (buffer[Pos*2] == 0x00 && buffer[Pos*2+1] == 'r') {
+				Buf[Pos2*2]   = 0;
+				Buf[Pos2*2+1] = 13;
+			}
+			if (buffer[Pos*2] == 0x00 && buffer[Pos*2+1] == '\\') {
+				Buf[Pos2*2]   = 0;
+				Buf[Pos2*2+1] = '\\';
+			}
+			Pos2++;
+			level = 0;
+		}
+		Pos++;
+	}
+	Buf[Pos2*2]   = 0;
+	Buf[Pos2*2+1] = 0;
+	return Buf;
+}
+
+char *DecodeSpecialChars(unsigned char *buffer)
+{
+	int 			Pos=0, Pos2=0, level=0;
+	static unsigned char	Buf[10000];
+
+	while (buffer[Pos]!=0x00) {
+		Buf[Pos2] = buffer[Pos];
+		switch (level) {
+		case 0:
+			if (buffer[Pos] == '\\') {
+				level = 1;
+			} else {
+				Pos2++;
+			}
+			break;
+		case 1:
+			if (buffer[Pos] == 'n') Buf[Pos2] = 10;
+			if (buffer[Pos] == 'r') Buf[Pos2] = 13;
+			if (buffer[Pos] == '\\') Buf[Pos2] = '\\';
+			Pos2++;
+			level = 0;
+		}
+		Pos++;
+	}
+	Buf[Pos2] = 0;
+	return Buf;
+}
+
+char *mystrcasestr(unsigned const char *a, unsigned const char *b)
+{
+	unsigned char 	A[2000], B[200];
+	int 		i;
+
+	memset(A,0,sizeof(A));
+	memset(B,0,sizeof(B));
+	for (i=0;i<(int)strlen(a);i++) A[i] = tolower(a[i]);
+	for (i=0;i<(int)strlen(b);i++) B[i] = tolower(b[i]);
+
+	return strstr(A,B);
+}
+
 unsigned int UnicodeLength(const unsigned char *str)
 {
 	unsigned int len = 0;
 
 	if (str == NULL) return 0;
 
 	while(str[len*2] != 0 || str[len*2+1] != 0) len++;
 
 	return len;
 }
 
 /* Convert Unicode char saved in src to dest */
@@ -577,32 +730,32 @@ void GSM_UnpackSemiOctetNumber(unsigned char *retval, unsigned char *Number, boo
 	unsigned char	Buffer[50]	= "";
 	int		length		= Number[0];
 
 	if (semioctet) {
 		/* Convert number of semioctets to number of chars */
 		if (length % 2) length++;
 		length=length / 2 + 1;
 	}
 
 	/*without leading byte with format of number*/  
 	length--;
 
-	switch (Number[1]) {
-	case NUMBER_ALPHANUMERIC:
+	switch ((Number[1] & 112)) {
+	case (NUMBER_ALPHANUMERIC_NUMBERING_PLAN_UNKNOWN & 112):
 		if (length > 6) length++;
 		dbgprintf("Alphanumeric number, length %i\n",length);
 		GSM_UnpackEightBitsToSeven(0, length, length, Number+2, Buffer);
 		Buffer[length]=0;
 		break;
-	case NUMBER_INTERNATIONAL:
+	case (NUMBER_INTERNATIONAL_NUMBERING_PLAN_ISDN & 112):
 		dbgprintf("International number\n");
 		Buffer[0]='+';
 		DecodeBCD(Buffer+1,Number+2, length);
 		break;
 	default:
 		dbgprintf("Default number %02x\n",Number[1]);
 		DecodeBCD (Buffer, Number+2, length);
 		break;
 	}
 
 	EncodeUnicode(retval,Buffer,strlen(Buffer));
 }
@@ -622,48 +775,48 @@ void GSM_UnpackSemiOctetNumber(unsigned char *retval, unsigned char *Number, boo
  *
  * 1 semioctet = 4 bits = half of byte
  */
 int GSM_PackSemiOctetNumber(unsigned char *Number, unsigned char *Output, bool semioctet)
 {
 	unsigned char	format, buffer[50];
 	int		length, i;
 
 	length=UnicodeLength(Number);
 	memcpy(buffer,DecodeUnicodeString(Number),length+1);
 
 	/* Checking for format number */
-	format = NUMBER_UNKNOWN;
+	format = NUMBER_UNKNOWN_NUMBERING_PLAN_ISDN;
 	for (i=0;i<length;i++) {
 		/* first byte is '+'. Number can be international */
 		if (i==0 && buffer[i]=='+') {
-			format=NUMBER_INTERNATIONAL;  
+			format=NUMBER_INTERNATIONAL_NUMBERING_PLAN_ISDN;  
 		} else {
 			/*char is not number. It must be alphanumeric*/
-			if (!isdigit(buffer[i])) format=NUMBER_ALPHANUMERIC;
+			if (!isdigit(buffer[i])) format=NUMBER_ALPHANUMERIC_NUMBERING_PLAN_UNKNOWN;
 		}
 	}
 
 	/**
 	 * First byte is used for saving type of number. See GSM 03.40
 	 * section 9.1.2.5
 	 */
 	Output[0]=format;
 
 	/* After number type we will have number. GSM 03.40 section 9.1.2 */
 	switch (format) {
-	case NUMBER_ALPHANUMERIC:
+	case NUMBER_ALPHANUMERIC_NUMBERING_PLAN_UNKNOWN:
 		length=GSM_PackSevenBitsToEight(0, buffer, Output+1, strlen(buffer))*2;
 		if (strlen(buffer)==7) length--;
 		break;
-	case NUMBER_INTERNATIONAL:
+	case NUMBER_INTERNATIONAL_NUMBERING_PLAN_ISDN:
 		length--;
 		EncodeBCD (Output+1, buffer+1, length, true);
 		break;
 	default:
 		EncodeBCD (Output+1, buffer, length, true);
 		break;
 	}
 
 	if (semioctet) return length;
 
 	/* Convert number of semioctets to number of chars */
 	if (length % 2) length++;
@@ -910,45 +1063,45 @@ void DecodeUnicodeSpecialNOKIAChars(unsigned char *dest, const unsigned char *sr
 		}
 	}
 	dest[current++] = 0x00;
 	dest[current++] = 0x00;
 }
 
 bool mystrncasecmp(unsigned const char *a, unsigned const char *b, int num)
 {
 	int i;
 
 	if (a == NULL || b == NULL) return false;
 
-	num--;
+	if (num == 0) num = -1;
    
 	for (i = 0; i != num; i++) {
 		if (a[i] == 0x00 && b[i] == 0x00) return true;
 		if (a[i] == 0x00 || b[i] == 0x00) return false;
 		if (tolower(a[i]) != tolower(b[i])) return false;
  	}
 	return true;
 }
 
 /* Compares two Unicode strings without regarding to case.
  * Return true, when they're equal
  */
 bool mywstrncasecmp(unsigned const  char *a, unsigned const  char *b, int num)
 {
  	int 		i;
   	wchar_t 	wc,wc2;
 
         if (a == NULL || b == NULL) return false;
 
-	num--;
+	if (num == 0) num = -1;
 	
 	for (i = 0; i != num; i++) {
 		if ((a[i*2] == 0x00 && a[i*2+1] == 0x00) && (b[i*2] == 0x00 && b[i*2+1] == 0x00)) return true;
 		if ((a[i*2] == 0x00 && a[i*2+1] == 0x00) || (b[i*2] == 0x00 && b[i*2+1] == 0x00)) return false;
  		wc  = a[i*2+1] | (a[i*2] << 8);
  		wc2 = b[i*2+1] | (b[i*2] << 8);
  		if (mytowlower(wc) != mytowlower(wc2)) return false;
  	}
 	return true;
 }
 
 /* wcscmp in Mandrake 9.0 is wrong */
@@ -1006,25 +1159,25 @@ int mytowlower(wchar_t c)
  */
 /*
  * The original strstr() file contains the following comment:
  *
  * My personal strstr() implementation that beats most other algorithms.
  * Until someone tells me otherwise, I assume that this is the
  * fastest implementation of strstr() in C.
  * I deliberately chose not to comment it.  You should have at least
  * as much fun trying to understand it, as I had to write it :-).
  *
  * Stephen R. van den Berg, berg@pool.informatik.rwth-aachen.de */
 
-unsigned char *mystrstr (const unsigned char *haystack, const unsigned char *needle)
+unsigned char *mywstrstr (const unsigned char *haystack, const unsigned char *needle)
 {
 /* One crazy define to convert unicode used in Gammu to standard wchar_t */
 #define tolowerwchar(x) (mytowlower((wchar_t)( (((&(x))[0] & 0xff) << 8) | (((&(x))[1] & 0xff)) )))
 	 register wchar_t b, c;
 
 	if ((b = tolowerwchar(*needle)) != L'\0') {
 		haystack -= 2;				/* possible ANSI violation */
 		do {
 			haystack += 2;
 			if ((c = tolowerwchar(*haystack)) == L'\0')
 				goto ret0;
 		} while (c != b);
diff --git a/gammu/emb/common/misc/coding/coding.h b/gammu/emb/common/misc/coding/coding.h
index d0c334d..4cf0038 100644
--- a/gammu/emb/common/misc/coding/coding.h
+++ b/gammu/emb/common/misc/coding/coding.h
@@ -1,49 +1,56 @@
 /* (c) 2002-2004 by Marcin Wiacek and others */
 
 #ifndef __coding_h
 #define __coding_h
 
+#if defined(_MSC_VER) && defined(__cplusplus)
+    extern "C" {
+#endif
+
 #include <stdlib.h>
 
 #include "../misc.h"
 
 #ifdef __OpenBSD__
 typedef		int wint_t;
 #endif
 
 /* ---------------------------- Unicode ------------------------------------ */
 bool 		mywstrncasecmp			(unsigned const char *a, unsigned const char *b, int num);
-unsigned char	*mystrstr			(unsigned const char *haystack, unsigned const char *needle);
+unsigned char	*mywstrstr			(unsigned const char *haystack, unsigned const char *needle);
 bool 		mywstrncmp			(unsigned const char *a, unsigned const char *b, int num);
 bool 		myiswspace	  		(unsigned const char *src);
 int 		mytowlower			(wchar_t c);
 
 unsigned int 	EncodeWithUnicodeAlphabet	(const unsigned char *value, wchar_t *dest);
 unsigned int 	DecodeWithUnicodeAlphabet	(wchar_t value, unsigned char *dest);
 
 unsigned int	UnicodeLength			(const unsigned char *str);
 unsigned char	*DecodeUnicodeString		(const unsigned char *src);
 unsigned char   *DecodeUnicodeConsole		(const unsigned char *src);
 void		DecodeUnicode			(const unsigned char *src, unsigned char *dest);
 void		EncodeUnicode			(unsigned char *dest, const unsigned char *src, int len);
 
 void 		CopyUnicodeString		(unsigned char *Dest, unsigned char *Source);
 void 		ReverseUnicodeString		(unsigned char *String);
 
 void 		ReadUnicodeFile			(unsigned char *Dest, unsigned char *Source);
 
 void 		DecodeUnicodeSpecialNOKIAChars	(unsigned char *dest, const unsigned char *src, int len);
 void 		EncodeUnicodeSpecialNOKIAChars	(unsigned char *dest, const unsigned char *src, int len);
 
+char 		*EncodeUnicodeSpecialChars	(unsigned char *buffer);
+char 		*DecodeUnicodeSpecialChars	(unsigned char *buffer);
+
 /* ------------------------------- BCD ------------------------------------- */
 unsigned char	EncodeWithBCDAlphabet		(int value);
 int		DecodeWithBCDAlphabet		(unsigned char value);
 
 void		DecodeBCD			(unsigned char *dest, const unsigned char *src, int len);
 void		EncodeBCD			(unsigned char *dest, const unsigned char *src, int len, bool fill);
 
 /* ------------------------------ UTF7 ------------------------------------- */
 void 		DecodeUTF7			(unsigned char *dest, const unsigned char *src, int len);
 
 /* ------------------------------ UTF8 ------------------------------------- */
 wchar_t		DecodeWithUTF8Alphabet		(unsigned char mychar3, unsigned char mychar4);
@@ -77,33 +84,33 @@ int GSM_UnpackEightBitsToSeven	(int offset, int in_length, int out_length,
 				 unsigned char *input, unsigned char *output);
 
 /* ----------------- Phone numbers according to GSM specs ------------------ */
 
 /**
  * Enum to handle types of phones numbers like
  * specified in GSM 03.40 section 9.1.2.5
  */
 typedef enum {
 	/**
 	 * Unknown number type
 	 */
-	NUMBER_UNKNOWN		= 0x81,
+	NUMBER_UNKNOWN_NUMBERING_PLAN_ISDN		= 0x81,
 	/**
 	 * International number (full number with code of country)
 	 */
-	NUMBER_INTERNATIONAL	= 0x91,
+	NUMBER_INTERNATIONAL_NUMBERING_PLAN_ISDN	= 0x91,
 	/**
 	 * Alphanumeric number (with chars too)
 	 */
-	NUMBER_ALPHANUMERIC	= 0xD0
+	NUMBER_ALPHANUMERIC_NUMBERING_PLAN_UNKNOWN	= 0xD0
 
 	/* specification give also other values */
 } GSM_NumberType;
 
 void		GSM_UnpackSemiOctetNumber	(unsigned char *retval, unsigned char *Number, bool semioctet);
 int		GSM_PackSemiOctetNumber		(unsigned char *Number, unsigned char *Output, bool semioctet);
 
 /* ---------------------------- Bits --------------------------------------- */
 
 void BufferAlign      (unsigned char *Destination, int *CurrentBit);
 void BufferAlignNumber(int *CurrentBit);
 
@@ -114,20 +121,28 @@ void GetBuffer    (unsigned char *Source, int *CurrentBit, unsigned char *Destin
 void GetBufferInt (unsigned char *Source, int *CurrentBit, int *integer, int BitsToProcess);
 void GetBufferI   (unsigned char *Source, int *CurrentBit, int *result, int BitsToProcess);
 
 int GetBit   (unsigned char *Buffer, int BitNum);
 int SetBit   (unsigned char *Buffer, int BitNum);
 int ClearBit (unsigned char *Buffer, int BitNum);
 
 /* ---------------------------- Other -------------------------------------- */
 
 void StringToDouble	(char *text, double *d);
 
 bool mystrncasecmp (unsigned const char *a, unsigned const char *b, int num);
+char *mystrcasestr 	(unsigned const char *a, unsigned const char *b);
 
 void MyGetLine(unsigned char *Buffer, int *Pos, unsigned char *OutBuffer, int MaxLen);
 
+char *EncodeSpecialChars(unsigned char *buffer);
+char *DecodeSpecialChars(unsigned char *buffer);
+
+#if defined(_MSC_VER) && defined(__cplusplus)
+    }
+#endif
+
 #endif
 
 /* How should editor hadle tabs in this file? Add editor commands here.
  * vim: noexpandtab sw=8 ts=8 sts=8:
  */
diff --git a/gammu/emb/common/misc/coding/md5.c b/gammu/emb/common/misc/coding/md5.c
index 30fe33f..abb61be 100644
--- a/gammu/emb/common/misc/coding/md5.c
+++ b/gammu/emb/common/misc/coding/md5.c
@@ -1,13 +1,13 @@
-/* Taken from ReHash (see http://www.reichlsoft.de.vu/) and released
+/* Taken from ReHash (www.reichlsoft.de.vu) and released
  * under GPL/LGPL with permission from ReHash author
  * Dominik Reichl <dominik.reichl@t-online.de>, Germany
  */
 
 /*
  **********************************************************************
  ** MD5.cpp                                                          **
  **                                                                  **
  ** - Style modified by Tony Ray, January 2001                       **
  **   Added support for randomizing initialization constants         **
  ** - Style modified by Dominik Reichl, April 2003                   **
  **   Optimized code                                                 **
diff --git a/gammu/emb/common/misc/misc.c b/gammu/emb/common/misc/misc.c
index c2f09e4..7227e7b 100644
--- a/gammu/emb/common/misc/misc.c
+++ b/gammu/emb/common/misc/misc.c
@@ -2,24 +2,27 @@
 /* Checking used compiler (c) 2002 by Michal Cihar */
  
 #include <string.h>
 #include <ctype.h>
 #include <time.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <locale.h>
 #include <sys/timeb.h>
 #ifdef WIN32
 #  include "windows.h"
 #endif
+#if defined(linux) || defined(__linux) || defined(__linux__)
+#  include <sys/utsname.h>
+#endif
 
 #include "../gsmstate.h"
 #include "misc.h"
 
 /* Based on article in Polish PC-Kurier 8/1998 page 104
  * Archive on http://www.pckurier.pl
  */
 char *DayOfWeek (int year, int month, int day)
 {
 	int 		p,q,r,w;
 	static char 	DayOfWeekChar[10];
 
@@ -222,28 +225,30 @@ char *OSDate (GSM_DateTime dt)
             	}
 	}
 
 #ifdef WIN32
 	setlocale(LC_ALL, ".ACP");
 #endif
 
 	return retval2;
 }
 
 bool CheckDate(GSM_DateTime *date)
 {
-	/* FIXME: This could also check if day is correct for selected month */
+	const unsigned int days[]={31,29,31,30,31,30,31,31,30,31,30,31};
+
+	/* FIXME: This could also check for leap years */
 	return date->Year != 0 &&
 		date->Month >= 1 && date->Month <= 12 &&
-		date->Day >= 1 && date->Day <= 31;
+	       date->Day >= 1 && date->Day <= days[date->Month];
 }
 
 bool CheckTime(GSM_DateTime *date)
 {
 	return date->Hour <= 23 && date->Hour >= 0 &&
 		date->Minute <= 59 && date->Minute >= 0 &&
 		date->Second <= 59 && date->Second >= 0;
 }
 
 int GetLine(FILE *File, char *Line, int count)
 {
 	int num;
@@ -442,24 +447,27 @@ void DumpMessage(FILE *df, Debug_Level dl, const unsigned char *message, int mes
 			j++;
 		}
 	}
 	if (j != 0) smfprintf(df, dl, "%s\n", buffer);
 }
 
 char *GetOS(void)
 {
 #ifdef WIN32
 	OSVERSIONINFOEX Ver;
 	bool		Extended = true;
 #endif
+#if defined(linux) || defined(__linux) || defined(__linux__)
+	struct utsname	Ver;
+#endif
 	static char 	Buffer[100] = {0x00};
 
 #ifdef WIN32
 	memset(&Ver,sizeof(OSVERSIONINFOEX),0);	
 	Ver.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
 
    	if (!GetVersionEx((OSVERSIONINFO *)&Ver)) {
 		Extended 		= false;
 	      	Ver.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
 	        if (!GetVersionEx((OSVERSIONINFO *)&Ver)) {
 //#ifdef _MSC_VER

 //			Ver.dwMajorVersion = _winmajor;
@@ -511,25 +519,26 @@ char *GetOS(void)
 
 	} else if (Ver.dwMajorVersion == 5 && Ver.dwMinorVersion == 2) {
 		sprintf(Buffer,"Win 2003");
 
 	} else {
 		sprintf(Buffer, "Windows %i.%i.%i",Ver.dwMajorVersion,Ver.dwMinorVersion,Ver.dwBuildNumber);
 	}
 
 	if (Extended && Ver.wServicePackMajor != 0) {
 		sprintf(Buffer+strlen(Buffer)," SP%i",Ver.wServicePackMajor);
 	}
 #elif defined(linux) || defined(__linux) || defined(__linux__)
-	sprintf(Buffer, "Linux");
+	uname(&Ver);
+	sprintf(Buffer, "Linux, kernel %s",Ver.release);
 #elif defined(__FreeBSD__)
 	sprintf(Buffer, "FreeBSD");
 #elif defined(__NetBSD__)
 	sprintf(Buffer, "NetBSD");
 #elif defined(__OpenBSD__)
 	sprintf(Buffer, "OpenBSD");
 #elif defined(__GNU__)
 	sprintf(Buffer, "GNU/Hurd");
 #elif defined(sun) || defined(__sun) || defined(__sun__)
 #  ifdef __SVR4
 	sprintf(Buffer, "Sun Solaris");
 #  else
diff --git a/gammu/emb/common/misc/misc.h b/gammu/emb/common/misc/misc.h
index 8b46170..c461001 100644
--- a/gammu/emb/common/misc/misc.h
+++ b/gammu/emb/common/misc/misc.h
@@ -1,17 +1,21 @@
 /* (c) 2002-2004 by Marcin Wiacek */
 
 #ifndef __misc_h
 #define __misc_h
 
+#if defined(_MSC_VER) && defined(__cplusplus)
+    extern "C" {
+#endif
+
 #include <stdio.h>
 #include <time.h>
 #ifdef WIN32
 #  include <windows.h>
 #endif
 
 #include "../config.h"
 
 #ifndef __cplusplus
 #ifndef false
 #  define false 0
 #endif
@@ -121,17 +125,21 @@ void GSM_GetCurrentDateTime 	(GSM_DateTime *Date);
 char *OSDateTime 		(GSM_DateTime dt, bool TimeZone);
 char *OSDate 			(GSM_DateTime dt);
 char *DayOfWeek 		(int year, int month, int day);
 time_t Fill_Time_T		(GSM_DateTime DT, int TZ);
 void GetTimeDifference		(unsigned long diff, GSM_DateTime *DT, bool Plus, int multi);
 void Fill_GSM_DateTime		(GSM_DateTime *Date, time_t timet);
 bool CheckDate			(GSM_DateTime *date);
 bool CheckTime			(GSM_DateTime *date);
 
 char 				*GetCompiler(void);
 char 				*GetOS(void);
 
+#if defined(_MSC_VER) && defined(__cplusplus)
+    }
+#endif
+
 #endif
 
 /* How should editor hadle tabs in this file? Add editor commands here.
  * vim: noexpandtab sw=8 ts=8 sts=8:
  */
diff --git a/gammu/emb/common/phone/alcatel/alcatel.c b/gammu/emb/common/phone/alcatel/alcatel.c
index f004ad4..3821f13 100644
--- a/gammu/emb/common/phone/alcatel/alcatel.c
+++ b/gammu/emb/common/phone/alcatel/alcatel.c
@@ -92,24 +92,25 @@ extern GSM_Error ATGEN_GetSecurityStatus	(GSM_StateMachine *s, GSM_SecurityCodeT
 extern GSM_Error ATGEN_ResetPhoneSettings	(GSM_StateMachine *s, GSM_ResetSettingsType Type);
 extern GSM_Error ATGEN_SendDTMF			(GSM_StateMachine *s, char *sequence);
 extern GSM_Error ATGEN_GetSIMIMSI		(GSM_StateMachine *s, char *IMSI);
 extern GSM_Error ATGEN_HandleCMSError		(GSM_StateMachine *s);
 extern GSM_Error ATGEN_GetNetworkInfo		(GSM_StateMachine *s, GSM_NetworkInfo *netinfo);
 extern GSM_Error ATGEN_Reset			(GSM_StateMachine *s, bool hard);
 extern GSM_Error ATGEN_PressKey			(GSM_StateMachine *s, GSM_KeyCode Key, bool Press);
 extern GSM_Error ATGEN_GetDisplayStatus		(GSM_StateMachine *s, GSM_DisplayFeatures *features);
 extern GSM_Error ATGEN_SetAutoNetworkLogin	(GSM_StateMachine *s);
 extern GSM_Error ATGEN_DeleteAllMemory		(GSM_StateMachine *s, GSM_MemoryType type);
 
 extern GSM_Error ATGEN_DispatchMessage		(GSM_StateMachine *s);
+extern GSM_Error ATGEN_SetFastSMSSending	(GSM_StateMachine *s, bool enable);
 extern GSM_Error ATGEN_SetIncomingCB		(GSM_StateMachine *s, bool enable);
 extern GSM_Error ATGEN_SetIncomingSMS		(GSM_StateMachine *s, bool enable);
 
 /**
  * Alcatel uses some 8-bit characters in contacts, calendar etc.. This table
  * attempts to decode it, it is probably not complete, here are just chars
  * that I found...
  */
 unsigned char GSM_AlcatelAlphabet[] =
 {
 /*	in phone	unicode		description	*/
 	0x80,		0x00,0x20,	/* empty	 */
@@ -535,24 +536,26 @@ static GSM_Error ALCATEL_SetATMode(GSM_StateMachine *s)
 	if (Priv->Mode == ModeAT) return ERR_NONE;
 
 	error = ALCATEL_GoToBinaryState(s, StateAttached, 0, 0);
 	if (error != ERR_NONE) return error;
 
 	error = s->Protocol.Functions->Terminate(s);
 	if (error != ERR_NONE) return error;
 
 	dbgprintf ("Changing protocol to AT\n");
 	s->Protocol.Functions			= &ATProtocol;
 	s->Phone.Functions->ReplyFunctions	= ATGENReplyFunctions;
 	Priv->Mode				= ModeAT;
+	s->Phone.Data.Priv.ATGEN.PBKCharset	= 0;
+	s->Phone.Data.Priv.ATGEN.PBKMemory	= 0;
 
 	my_sleep(100);
 
 	/* In case we don't send AT command short after closing binary mode,
 	 * phone takes VERY long to react next time. The error code in
 	 * intetionally ignored.
 	 */
 	GSM_WaitFor (s, "AT\r", 3, 0x00, 0, ID_IncomingFrame);
 
 	return ERR_NONE;
 }
 
@@ -3813,24 +3816,32 @@ static GSM_Error ALCATEL_SetIncomingCB (GSM_StateMachine *s, bool enable)
 	if ((error = ALCATEL_SetATMode(s))!= ERR_NONE) return error;
 	return ATGEN_SetIncomingCB(s, enable);
 }
 
 static GSM_Error ALCATEL_SetIncomingSMS (GSM_StateMachine *s, bool enable)
 {
 	GSM_Error error;
 
 	if ((error = ALCATEL_SetATMode(s))!= ERR_NONE) return error;
 	return ATGEN_SetIncomingSMS(s, enable);
 }
 
+static GSM_Error ALCATEL_SetFastSMSSending(GSM_StateMachine *s, bool enable)
+{
+	GSM_Error error;
+
+	if ((error = ALCATEL_SetATMode(s))!= ERR_NONE) return error;
+	return ATGEN_SetFastSMSSending(s, enable);
+}
+
 static GSM_Reply_Function ALCATELReplyFunctions[] = {
 {ALCATEL_ReplyGeneric,		"\x02",0x00,0x00, ID_AlcatelAttach		},
 {ALCATEL_ReplyGeneric,		"\x02",0x00,0x00, ID_AlcatelDetach		},
 {ALCATEL_ReplyGeneric,		"\x02",0x00,0x00, ID_AlcatelCommit		},
 {ALCATEL_ReplyCommit,		"\x02",0x00,0x00, ID_AlcatelCommit2		},
 {ALCATEL_ReplyGeneric,		"\x02",0x00,0x00, ID_AlcatelEnd			},
 {ALCATEL_ReplyGeneric,		"\x02",0x00,0x00, ID_AlcatelClose		},
 {ALCATEL_ReplyGeneric,		"\x02",0x00,0x00, ID_AlcatelStart		},
 {ALCATEL_ReplyGeneric,		"\x02",0x00,0x00, ID_AlcatelSelect1		},
 {ALCATEL_ReplyGeneric,		"\x02",0x00,0x00, ID_AlcatelSelect2		},
 {ALCATEL_ReplyGeneric,		"\x02",0x00,0x00, ID_AlcatelSelect3		},
 {ALCATEL_ReplyGeneric,		"\x02",0x00,0x00, ID_AlcatelBegin1		},
@@ -3904,24 +3915,25 @@ GSM_Phone_Functions ALCATELPhone = {
 	NOTSUPPORTED,			/* 	GetSpeedDial		*/
 	NOTSUPPORTED,			/* 	SetSpeedDial		*/
 	ALCATEL_GetSMSC,
 	ALCATEL_SetSMSC,
 	ALCATEL_GetSMSStatus,
 	ALCATEL_GetSMS,
 	ALCATEL_GetNextSMS,
 	NOTSUPPORTED,			/*	SetSMS			*/
 	ALCATEL_AddSMS,
 	ALCATEL_DeleteSMS,
 	ALCATEL_SendSMS,
 	ALCATEL_SendSavedSMS,
+	ALCATEL_SetFastSMSSending,
 	ALCATEL_SetIncomingSMS,
 	ALCATEL_SetIncomingCB,
 	ALCATEL_GetSMSFolders,
  	NOTSUPPORTED,			/* 	AddSMSFolder		*/
  	NOTSUPPORTED,			/* 	DeleteSMSFolder		*/
 	ALCATEL_DialVoice,
 	ALCATEL_AnswerCall,
 	ALCATEL_CancelCall,
  	NOTSUPPORTED,			/* 	HoldCall 		*/
  	NOTSUPPORTED,			/* 	UnholdCall 		*/
  	NOTSUPPORTED,			/* 	ConferenceCall 		*/
  	NOTSUPPORTED,			/* 	SplitCall		*/
@@ -3958,25 +3970,25 @@ GSM_Phone_Functions ALCATELPhone = {
 	ALCATEL_AddToDo,
 	ALCATEL_DeleteToDo,
 	ALCATEL_DeleteAllToDo,
 	ALCATEL_GetCalendarStatus,
 	ALCATEL_GetCalendar,
 	ALCATEL_GetNextCalendar,
 	ALCATEL_SetCalendar,
 	ALCATEL_AddCalendar,
 	ALCATEL_DeleteCalendar,
 	ALCATEL_DeleteAllCalendar,
 	NOTSUPPORTED,			/* 	GetCalendarSettings	*/
 	NOTSUPPORTED,			/* 	SetCalendarSettings	*/
-	NOTSUPPORTED,			/*	GetNote			*/
+	NOTSUPPORTED,			/*	GetNextNote		*/
 	NOTSUPPORTED,			/* 	GetProfile		*/
 	NOTSUPPORTED,			/* 	SetProfile		*/
 	NOTSUPPORTED,			/* 	GetFMStation		*/
 	NOTSUPPORTED,			/* 	SetFMStation		*/
 	NOTSUPPORTED,			/* 	ClearFMStations		*/
 	NOTSUPPORTED,			/* 	GetNextFileFolder	*/
 	NOTSUPPORTED,			/* 	GetFilePart		*/
 	NOTSUPPORTED,			/* 	AddFilePart		*/
 	NOTSUPPORTED, 			/* 	GetFileSystemStatus	*/
 	NOTSUPPORTED,			/* 	DeleteFile		*/
 	NOTSUPPORTED,			/* 	AddFolder		*/
 	NOTSUPPORTED,			/* 	GetGPRSAccessPoint	*/
diff --git a/gammu/emb/common/phone/at/atgen.c b/gammu/emb/common/phone/at/atgen.c
index 1834f15..ba23eb2 100644
--- a/gammu/emb/common/phone/at/atgen.c
+++ b/gammu/emb/common/phone/at/atgen.c
@@ -3,55 +3,35 @@
 #include "../../gsmstate.h"
 
 #ifdef GSM_ENABLE_ATGEN
 
 #include <string.h>
 #include <time.h>
 #include <ctype.h>
 
 #include "../../gsmcomon.h"
 #include "../../misc/coding/coding.h"
 #include "../../service/sms/gsmsms.h"
 #include "../pfunc.h"
+
 #include "atgen.h"
 
+#include "samsung.h"
+#include "siemens.h"
+#include "sonyeric.h"
+
 #ifdef GSM_ENABLE_ALCATEL
-extern GSM_Error ALCATEL_ProtocolVersionReply	(GSM_Protocol_Message msg, GSM_StateMachine *s);
+GSM_Error ALCATEL_ProtocolVersionReply (GSM_Protocol_Message, GSM_StateMachine *);
 #endif
 
-extern GSM_Error ATGEN_CMS35ReplyGetBitmap	(GSM_Protocol_Message msg, GSM_StateMachine *s);
-extern GSM_Error ATGEN_CMS35ReplySetBitmap	(GSM_Protocol_Message msg, GSM_StateMachine *s);
-extern GSM_Error ATGEN_CMS35ReplyGetRingtone	(GSM_Protocol_Message msg, GSM_StateMachine *s);
-extern GSM_Error ATGEN_CMS35ReplySetRingtone	(GSM_Protocol_Message msg, GSM_StateMachine *s);
-extern GSM_Error ATGEN_CMS35ReplyGetNextCal	(GSM_Protocol_Message msg, GSM_StateMachine *s);
-extern GSM_Error ATGEN_CMS35ReplySetCalendar	(GSM_Protocol_Message msg, GSM_StateMachine *s);
-extern GSM_Error ATGEN_CMS35ReplyDeleteCalendar	(GSM_Protocol_Message msg, GSM_StateMachine *s);
-extern GSM_Error ATGEN_SL45ReplyGetMemory	(GSM_Protocol_Message msg, GSM_StateMachine *s);
-
-extern GSM_Error ATGEN_GetRingtone		(GSM_StateMachine *s, GSM_Ringtone *Ringtone, bool PhoneRingtone);
-extern GSM_Error ATGEN_SetRingtone		(GSM_StateMachine *s, GSM_Ringtone *Ringtone, int *maxlength);
-extern GSM_Error ATGEN_GetBitmap		(GSM_StateMachine *s, GSM_Bitmap *Bitmap);
-extern GSM_Error ATGEN_SetBitmap		(GSM_StateMachine *s, GSM_Bitmap *Bitmap);
-extern GSM_Error SIEMENS_GetNextCalendar	(GSM_StateMachine *s, GSM_CalendarEntry *Note, bool start);
-extern GSM_Error SIEMENS_AddCalendarNote	(GSM_StateMachine *s, GSM_CalendarEntry *Note);
-extern GSM_Error SIEMENS_DelCalendarNote	(GSM_StateMachine *s, GSM_CalendarEntry *Note);
-
-extern GSM_Error SONYERIC_GetNextCalendar	(GSM_StateMachine *s, GSM_CalendarEntry *Note, bool start);
-extern GSM_Error SONYERIC_GetNextToDo		(GSM_StateMachine *s, GSM_ToDoEntry *ToDo, bool start);
-extern GSM_Error SONYERIC_GetToDoStatus		(GSM_StateMachine *s, GSM_ToDoStatus *status);
-extern GSM_Error SONYERIC_AddCalendarNote	(GSM_StateMachine *s, GSM_CalendarEntry *Note);
-extern GSM_Error SONYERIC_AddToDo		(GSM_StateMachine *s, GSM_ToDoEntry *ToDo);
-extern GSM_Error SONYERIC_DeleteAllToDo		(GSM_StateMachine *s);
-extern GSM_Error SONYERIC_DelCalendarNote	(GSM_StateMachine *s, GSM_CalendarEntry *Note);
-extern GSM_Error SONYERIC_GetCalendarStatus	(GSM_StateMachine *s, GSM_CalendarStatus *Status);
 
 typedef struct {
 	int     Number;
 	char    Text[60];
 } ATErrorCode;
 
 static ATErrorCode CMSErrorCodes[] = {
 	/*
 	 * Error codes not specified here were either undefined or reserved in my
 	 * copy of specifications, if you have newer one, please fill in the gaps.
 	 */
 	/* 0...127 from GSM 04.11 Annex E-2 */
@@ -166,24 +146,26 @@ GSM_Error ATGEN_HandleCMEError(GSM_StateMachine *s)
 {
 	GSM_Phone_ATGENData *Priv = &s->Phone.Data.Priv.ATGEN;
 
 	if (Priv->ErrorCode == 0) {
 		smprintf(s, "CME Error occured, but it's type not detected\n");
 	} else if (Priv->ErrorText == NULL) {
 		smprintf(s, "CME Error %i, no description available\n", Priv->ErrorCode);
 	} else {
 		smprintf(s, "CME Error %i: \"%s\"\n", Priv->ErrorCode, Priv->ErrorText);
 	}
 	/* For error codes descriptions see table a bit above */
 	switch (Priv->ErrorCode) {
+		case -1:
+			return ERR_EMPTY;
 		case 3:
 			return ERR_PERMISSION;
 		case 4:
 			return ERR_NOTSUPPORTED;
 		case 5:
 		case 11:
 		case 12:
 		case 16:
 		case 17:
 		case 18:
 			return ERR_SECURITYERROR;
 		case 20:
@@ -247,26 +229,34 @@ int ATGEN_ExtractOneParameter(unsigned char *input, unsigned char *output)
 		*output=*input;
 		input	++;
 		output	++;
 		position++;
 	}
 	*output=0;
 	position++;
 	return position;
 }
 
 void ATGEN_DecodeDateTime(GSM_DateTime *dt, unsigned char *input)
 {
-	dt->Year=2000+(*input-'0')*10;     input++;
+	/* Samsung phones report year as %d instead of %02d */
+	if (input[2] == '/') {
+		dt->Year=(*input-'0')*10;
+		input++;
+	} else {
+		dt->Year=0;
+	}
+
 	dt->Year=dt->Year+(*input-'0');    input++;
+	dt->Year+=2000;
 
 	input++;
 	dt->Month=(*input-'0')*10;         input++;
 	dt->Month=dt->Month+(*input-'0');  input++;
 
 	input++;
 	dt->Day=(*input-'0')*10;           input++;
 	dt->Day=dt->Day+(*input-'0');      input++;
 
 	input++;
 	dt->Hour=(*input-'0')*10;          input++;
 	dt->Hour=dt->Hour+(*input-'0');    input++;
@@ -313,24 +303,36 @@ GSM_Error ATGEN_DispatchMessage(GSM_StateMachine *s)
 	if (!strcmp(line,"OK"))		Priv->ReplyState = AT_Reply_OK;
 	if (!strcmp(line,"> "))		Priv->ReplyState = AT_Reply_SMSEdit;
 	if (!strcmp(line,"CONNECT"))	Priv->ReplyState = AT_Reply_Connect;
 	if (!strcmp(line,"ERROR"  ))	Priv->ReplyState = AT_Reply_Error;
 	if (!strncmp(line,"+CME ERROR:",11)) {
 		Priv->ReplyState = AT_Reply_CMEError;
 		ErrorCodes = CMEErrorCodes;
 	}
 	if (!strncmp(line,"+CMS ERROR:",11)) {
 		Priv->ReplyState = AT_Reply_CMSError;
 		ErrorCodes = CMSErrorCodes;
 	}
+
+	/* FIXME: Samsung phones can answer +CME ERROR:-1 meaning empty location */
+	if (Priv->ReplyState == AT_Reply_CMEError && Priv->Manufacturer == AT_Samsung) {
+		err = line + 11;
+		Priv->ErrorCode = atoi(err);
+
+		if (Priv->ErrorCode == -1) {
+			Priv->ErrorText = "[Samsung] Empty location";
+			return GSM_DispatchMessage(s);
+		}
+	}
+
 	if (Priv->ReplyState == AT_Reply_CMEError || Priv->ReplyState == AT_Reply_CMSError) {
 	        j = 0;
 		/* One char behind +CM[SE] ERROR */
 		err = line + 12;
 		while (err[j] && !isalnum(err[j])) j++;
 		if (isdigit(err[j])) {
 			Priv->ErrorCode = atoi(&(err[j]));
 			k = 0;
 			while (ErrorCodes[k].Number != -1) {
 				if (ErrorCodes[k].Number == Priv->ErrorCode) {
 					Priv->ErrorText = (char *)&(ErrorCodes[k].Text);
 					break;
@@ -361,52 +363,90 @@ GSM_Error ATGEN_GenericReply(GSM_Protocol_Message msg, GSM_StateMachine *s)
 		case AT_Reply_Error:
 			return ERR_UNKNOWN;
 		case AT_Reply_CMSError:
 			return ATGEN_HandleCMSError(s);
 		case AT_Reply_CMEError:
 			return ATGEN_HandleCMEError(s);
 		default:
 			break;
 	}
 	return ERR_UNKNOWNRESPONSE;
 }
 
+GSM_Error ATGEN_ReplyGetUSSD(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+	unsigned char 	buffer[2000],buffer2[4000];
+	int 		i = 10;
+
+	/* Ugly hack */	
+	while (msg.Buffer[i]!=13) i++;
+	i = i - 6;
+	memcpy(buffer,msg.Buffer+10,i-11);
+	buffer[i-11] = 0x00;
+
+	smprintf(s, "USSD reply: \"%s\"\n",buffer);
+
+	if (s->Phone.Data.EnableIncomingUSSD && s->User.IncomingUSSD!=NULL) {
+		EncodeUnicode(buffer2,buffer,strlen(buffer));
+		s->User.IncomingUSSD(s->CurrentConfig->Device, buffer2);
+	}
+
+	return ERR_NONE;
+}
+
+GSM_Error ATGEN_SetIncomingUSSD(GSM_StateMachine *s, bool enable)
+{
+	GSM_Error error;
+
+	if (enable) {
+		smprintf(s, "Enabling incoming USSD\n");
+		error=GSM_WaitFor (s, "AT+CUSD=1\r", 10, 0x00, 3, ID_SetUSSD);
+	} else {
+		smprintf(s, "Disabling incoming USSD\n");
+		error=GSM_WaitFor (s, "AT+CUSD=0\r", 10, 0x00, 3, ID_SetUSSD);
+	}
+	if (error==ERR_NONE) s->Phone.Data.EnableIncomingUSSD = enable;
+	return error;
+}
+
 GSM_Error ATGEN_ReplyGetModel(GSM_Protocol_Message msg, GSM_StateMachine *s)
 {
 	GSM_Phone_ATGENData 	*Priv = &s->Phone.Data.Priv.ATGEN;
 	GSM_Phone_Data		*Data = &s->Phone.Data;
 
 	if (s->Phone.Data.Priv.ATGEN.ReplyState != AT_Reply_OK) return ERR_NOTSUPPORTED;
 
 	if (strlen(GetLineString(msg.Buffer, Priv->Lines, 2)) <= MAX_MODEL_LENGTH) {
 		CopyLineString(Data->Model, msg.Buffer, Priv->Lines, 2);
 
 		/* Sometimes phone adds this before manufacturer (Sagem) */
 		if (strncmp("+CGMM: ", Data->Model, 7) == 0) {
 			memmove(Data->Model, Data->Model + 7, strlen(Data->Model + 7) + 1);
 		}
 
 		Data->ModelInfo = GetModelData(NULL,Data->Model,NULL);
 		if (Data->ModelInfo->number[0] == 0) Data->ModelInfo = GetModelData(NULL,NULL,Data->Model);
 		if (Data->ModelInfo->number[0] == 0) Data->ModelInfo = GetModelData(Data->Model,NULL,NULL);
 
 		if (Data->ModelInfo->number[0] != 0) strcpy(Data->Model,Data->ModelInfo->number);
 
 		if (strstr(msg.Buffer,"Nokia")) 	Priv->Manufacturer = AT_Nokia;
 		else if (strstr(msg.Buffer,"M20")) 	Priv->Manufacturer = AT_Siemens;
 		else if (strstr(msg.Buffer,"MC35")) 	Priv->Manufacturer = AT_Siemens;
+		else if (strstr(msg.Buffer,"TC35")) 	Priv->Manufacturer = AT_Siemens;
 		else if (strstr(msg.Buffer, "iPAQ")) 	Priv->Manufacturer = AT_HP;
 
 		if (strstr(msg.Buffer,"M20")) 		strcpy(Data->Model,"M20");
 		else if (strstr(msg.Buffer,"MC35")) 	strcpy(Data->Model,"MC35");
+		else if (strstr(msg.Buffer,"TC35")) 	strcpy(Data->Model,"TC35");
 		else if (strstr(msg.Buffer, "iPAQ")) 	strcpy(Data->Model,"iPAQ");
 	} else {
 		smprintf(s, "WARNING: Model name too long, increase MAX_MODEL_LENGTH to at least %zd\n", strlen(GetLineString(msg.Buffer, Priv->Lines, 2)));
 	}
 
 	return ERR_NONE;
 }
 
 GSM_Error ATGEN_GetModel(GSM_StateMachine *s)
 {
 	GSM_Error error;
 
@@ -472,24 +512,29 @@ GSM_Error ATGEN_ReplyGetManufacturer(GSM_Protocol_Message msg, GSM_StateMachine
 			Priv->Manufacturer = AT_HP;
 		}
 		if (strstr(msg.Buffer,"ALCATEL")) {
 			smprintf(s, "Alcatel\n");
 			strcpy(s->Phone.Data.Manufacturer,"Alcatel");
 			Priv->Manufacturer = AT_Alcatel;
 		}
 		if (strstr(msg.Buffer,"SAGEM")) {
 			smprintf(s, "Sagem\n");
 			strcpy(s->Phone.Data.Manufacturer,"Sagem");
 			Priv->Manufacturer = AT_Sagem;
 		}
+		if (strstr(msg.Buffer,"Samsung")) {
+			smprintf(s, "Samsung\n");
+			strcpy(s->Phone.Data.Manufacturer,"Samsung");
+			Priv->Manufacturer = AT_Samsung;
+		}
 		return ERR_NONE;
 	case AT_Reply_CMSError:
 		return ATGEN_HandleCMSError(s);
 	default:
 		break;
 	}
 	return ERR_UNKNOWNRESPONSE;
 }
 
 GSM_Error ATGEN_GetManufacturer(GSM_StateMachine *s)
 {
 	if (s->Phone.Data.Manufacturer[0] != 0) return ERR_NONE;
@@ -665,34 +710,44 @@ GSM_Error ATGEN_ReplyGetSMSMemories(GSM_Protocol_Message msg, GSM_StateMachine *
 	case AT_Reply_OK:
 		/* Reply here is:
 		 * (memories for reading)[, (memories for writing)[, (memories for storing received messages)]]
 		 * each memory is in quotes, 
 		 * Example: ("SM"), ("SM"), ("SM")
 		 *
 		 * We need to get from this supported memories. For this case
 		 * we assume, that just appearence of memory makes it
 		 * available for everything. Then we need to find out whether
 		 * phone supports writing to memory. This is done by searching
 		 * for "), (", which will appear between lists.
 		 */
-		s->Phone.Data.Priv.ATGEN.CanSaveSMS = (strstr(msg.Buffer, "), (") != NULL);
+		s->Phone.Data.Priv.ATGEN.CanSaveSMS = false;
+		if (strstr(msg.Buffer, "), (") != NULL || strstr(msg.Buffer, "),(") != NULL) {
+			s->Phone.Data.Priv.ATGEN.CanSaveSMS = true;
+		}
+
 		if (strstr(msg.Buffer, "\"SM\"") != NULL) s->Phone.Data.Priv.ATGEN.SIMSMSMemory = AT_AVAILABLE;
 		else s->Phone.Data.Priv.ATGEN.SIMSMSMemory = AT_NOTAVAILABLE;
+
 		if (strstr(msg.Buffer, "\"ME\"") != NULL) s->Phone.Data.Priv.ATGEN.PhoneSMSMemory = AT_AVAILABLE;
 		else s->Phone.Data.Priv.ATGEN.PhoneSMSMemory = AT_NOTAVAILABLE;
-		smprintf(s, "Available SMS memories received, ME = %d, SM = %d\n", s->Phone.Data.Priv.ATGEN.PhoneSMSMemory, s->Phone.Data.Priv.ATGEN.SIMSMSMemory);
+
+		smprintf(s, "Available SMS memories received, ME = %d, SM = %d, cansavesms =", s->Phone.Data.Priv.ATGEN.PhoneSMSMemory, s->Phone.Data.Priv.ATGEN.SIMSMSMemory);
+		if (s->Phone.Data.Priv.ATGEN.CanSaveSMS) smprintf(s, "true");
+		smprintf(s, "\n");
 		return ERR_NONE;
 	case AT_Reply_Error:
 	case AT_Reply_CMSError:
 		return ATGEN_HandleCMSError(s);
+	case AT_Reply_CMEError:
+		return ATGEN_HandleCMEError(s);
 	default:
 		return ERR_UNKNOWNRESPONSE;
 	}
 }
 
 GSM_Error ATGEN_GetSMSMemories(GSM_StateMachine *s)
 {
 	smprintf(s, "Getting available SMS memories\n");
 	return GSM_WaitFor (s, "AT+CPMS=?\r", 10, 0x00, 4, ID_GetSMSMemories);
 }
 
 GSM_Error ATGEN_SetSMSMemory(GSM_StateMachine *s, bool SIM)
@@ -849,26 +904,27 @@ GSM_Error ATGEN_ReplyGetSMSMessage(GSM_Protocol_Message msg, GSM_StateMachine *s
 			CopyLineString(buffer, msg.Buffer, Priv->Lines, 2);
 			switch (buffer[7]) {
 				case '0': sms->State = SMS_UnRead; 	break;
 				case '1': sms->State = SMS_Read;	break;
 				case '2': sms->State = SMS_UnSent;	break;
 				default : sms->State = SMS_Sent;	break;//case '3'
 			}
 			DecodeHexBin (buffer, GetLineString(msg.Buffer,Priv->Lines,3), strlen(GetLineString(msg.Buffer,Priv->Lines,3)));
 			/* Siemens MC35 (only ?) */
 			if (strstr(msg.Buffer,"+CMGR: 0,,0")!=NULL) return ERR_EMPTY;
 			/* Siemens M20 */
 			if (IsPhoneFeatureAvailable(s->Phone.Data.ModelInfo, F_M20SMS)) {
-				if (buffer[1]!=NUMBER_UNKNOWN && buffer[1]!=NUMBER_INTERNATIONAL &&
-				    buffer[1]!=NUMBER_ALPHANUMERIC) {
+				/* we check for the most often visible */
+				if (buffer[1]!=NUMBER_UNKNOWN_NUMBERING_PLAN_ISDN && buffer[1]!=NUMBER_INTERNATIONAL_NUMBERING_PLAN_ISDN &&
+				    buffer[1]!=NUMBER_ALPHANUMERIC_NUMBERING_PLAN_UNKNOWN) {
 					/* Seems to be Delivery Report */
 					smprintf(s, "SMS type - status report (M20 style)\n");
 					sms->PDU 	 = SMS_Status_Report;
 					sms->Folder 	 = 1;	/*INBOX SIM*/
 					sms->InboxFolder = true;
 
 					smsframe[12]=buffer[current++];
 					smsframe[PHONE_SMSStatusReport.TPMR]=buffer[current++];
 					current2=((buffer[current])+1)/2+1;
 					for(i=0;i<current2+1;i++) smsframe[PHONE_SMSStatusReport.Number+i]=buffer[current++];
 					for(i=0;i<7;i++) smsframe[PHONE_SMSStatusReport.DateTime+i]=buffer[current++];
 					smsframe[0] = 0;
@@ -885,25 +941,25 @@ GSM_Error ATGEN_ReplyGetSMSMessage(GSM_Protocol_Message msg, GSM_StateMachine *s
 			switch (smsframe[12] & 0x03) {
 			case 0x00:
 				smprintf(s, "SMS type - deliver\n");
 				sms->PDU 	 = SMS_Deliver;
 				if (Priv->SMSMemory == MEM_SM) {
 					sms->Folder = 1; /*INBOX SIM*/ 
 				} else {
 					sms->Folder = 3; /*INBOX ME*/ 
 				}
 				sms->InboxFolder = true;
 				current2=((buffer[current])+1)/2+1;
 				if (IsPhoneFeatureAvailable(s->Phone.Data.ModelInfo, F_M20SMS)) {
-					if (buffer[current+1]==NUMBER_ALPHANUMERIC) {
+					if (buffer[current+1]==NUMBER_ALPHANUMERIC_NUMBERING_PLAN_UNKNOWN) {
 						smprintf(s, "Trying to read alphanumeric number\n");
 						for(i=0;i<4;i++) smsframe[PHONE_SMSDeliver.Number+i]=buffer[current++];
 						current+=6;
 						for(i=0;i<current2-3;i++) smsframe[PHONE_SMSDeliver.Number+i+4]=buffer[current++];
 					} else {
 						for(i=0;i<current2+1;i++) smsframe[PHONE_SMSDeliver.Number+i]=buffer[current++];
 					}
 				} else {
 					for(i=0;i<current2+1;i++) smsframe[PHONE_SMSDeliver.Number+i]=buffer[current++];
 				}
 				smsframe[PHONE_SMSDeliver.TPPID] = buffer[current++];
 				smsframe[PHONE_SMSDeliver.TPDCS] = buffer[current++];
@@ -916,49 +972,49 @@ GSM_Error ATGEN_ReplyGetSMSMessage(GSM_Protocol_Message msg, GSM_StateMachine *s
 				smprintf(s, "SMS type - submit\n");
 				sms->PDU 	 = SMS_Submit;
 				if (Priv->SMSMemory == MEM_SM) {
 					sms->Folder = 2; /*OUTBOX SIM*/ 
 					smprintf(s, "Outbox SIM\n");
 				} else {
 					sms->Folder = 4; /*OUTBOX ME*/ 
 				}
 				sms->InboxFolder = false;
 				smsframe[PHONE_SMSSubmit.TPMR] = buffer[current++];
 				current2=((buffer[current])+1)/2+1;
 				if (IsPhoneFeatureAvailable(s->Phone.Data.ModelInfo, F_M20SMS)) {
-					if (buffer[current+1]==NUMBER_ALPHANUMERIC) {
+					if (buffer[current+1]==NUMBER_ALPHANUMERIC_NUMBERING_PLAN_UNKNOWN) {
 						smprintf(s, "Trying to read alphanumeric number\n");
 						for(i=0;i<4;i++) smsframe[PHONE_SMSSubmit.Number+i]=buffer[current++];
 						current+=6;
 						for(i=0;i<current2-3;i++) smsframe[PHONE_SMSSubmit.Number+i+4]=buffer[current++];
 					} else {
 						for(i=0;i<current2+1;i++) smsframe[PHONE_SMSSubmit.Number+i]=buffer[current++];
 					}
 				} else {
 					for(i=0;i<current2+1;i++) smsframe[PHONE_SMSSubmit.Number+i]=buffer[current++];
 				}
 				smsframe[PHONE_SMSSubmit.TPPID] = buffer[current++];
 				smsframe[PHONE_SMSSubmit.TPDCS] = buffer[current++];
 				/* See GSM 03.40 9.2.3.3 - TPVP can not exist in frame */
 				if ((smsframe[12] & 0x18)!=0) current++; //TPVP is ignored now
 				smsframe[PHONE_SMSSubmit.TPUDL] = buffer[current++];
 				for(i=0;i<smsframe[PHONE_SMSSubmit.TPUDL];i++) smsframe[i+PHONE_SMSSubmit.Text]=buffer[current++];
 				GSM_DecodeSMSFrame(sms,smsframe,PHONE_SMSSubmit);
 				return ERR_NONE;
 			case 0x02:
 				smprintf(s, "SMS type - status report\n");
 				sms->PDU 	 = SMS_Status_Report;
 				sms->Folder 	 = 1;	/*INBOX SIM*/
 				sms->InboxFolder = true;
-				smprintf(s, "TPMR is %02x\n",buffer[current]);
+				smprintf(s, "TPMR is %d\n",buffer[current]);
 				smsframe[PHONE_SMSStatusReport.TPMR] = buffer[current++];
 				current2=((buffer[current])+1)/2+1;
 				for(i=0;i<current2+1;i++) smsframe[PHONE_SMSStatusReport.Number+i]=buffer[current++];
 				for(i=0;i<7;i++) smsframe[PHONE_SMSStatusReport.DateTime+i]=buffer[current++];
 				for(i=0;i<7;i++) smsframe[PHONE_SMSStatusReport.SMSCTime+i]=buffer[current++];
 				smsframe[PHONE_SMSStatusReport.TPStatus]=buffer[current];
 				GSM_DecodeSMSFrame(sms,smsframe,PHONE_SMSStatusReport);
 				return ERR_NONE;
 			}
 			break;
 		case SMS_AT_TXT:
 			current = 0;
@@ -1631,35 +1687,35 @@ GSM_Error ATGEN_ReplySendSMS(GSM_Protocol_Message msg, GSM_StateMachine *s)
 	if (s->Protocol.Data.AT.EditMode) {
 		if (s->Phone.Data.Priv.ATGEN.ReplyState != AT_Reply_SMSEdit) {
 			return ERR_UNKNOWN;
 		}
 		s->Protocol.Data.AT.EditMode = false;
 		return ERR_NONE;
 	}
 
 	switch (Priv->ReplyState) {
 	case AT_Reply_OK:
  		smprintf(s, "SMS sent OK\n");
  		if (s->User.SendSMSStatus!=NULL) {
-			start = strstr(msg.Buffer, "+CMGW: ");
+			start = strstr(msg.Buffer, "+CMGS: ");
 			if (start != NULL) {
 				s->User.SendSMSStatus(s->CurrentConfig->Device,0,atoi(start+7));
 			} else {
-				s->User.SendSMSStatus(s->CurrentConfig->Device,0,0);
+				s->User.SendSMSStatus(s->CurrentConfig->Device,0,-1);
 			}
 		}
 		return ERR_NONE;
 	case AT_Reply_CMSError:
  		smprintf(s, "Error %i\n",Priv->ErrorCode);
- 		if (s->User.SendSMSStatus!=NULL) s->User.SendSMSStatus(s->CurrentConfig->Device,Priv->ErrorCode,0);
+ 		if (s->User.SendSMSStatus!=NULL) s->User.SendSMSStatus(s->CurrentConfig->Device,Priv->ErrorCode,-1);
  		return ATGEN_HandleCMSError(s);
 	case AT_Reply_Error:
 		return ERR_UNKNOWN;
 	default:
 		return ERR_UNKNOWNRESPONSE;
 	}
 }
 
 GSM_Error ATGEN_SendSMS(GSM_StateMachine *s, GSM_SMSMessage *sms)
 {
 	GSM_Error 		error,error2;
 	int			current, current2, Replies;
@@ -1778,24 +1834,37 @@ GSM_Error ATGEN_SetDateTime(GSM_StateMachine *s, GSM_DateTime *date_time)
 GSM_Error ATGEN_GetAlarm(GSM_StateMachine *s, GSM_Alarm *alarm)
 {
 	if (alarm->Location != 1) return ERR_NOTSUPPORTED;
 
 	alarm->Repeating = true;
 	alarm->Text[0] = 0; alarm->Text[1] = 0;
 
 	s->Phone.Data.Alarm = alarm;
 	smprintf(s, "Getting alarm\n");
 	return GSM_WaitFor (s, "AT+CALA?\r", 9, 0x00, 4, ID_GetAlarm);
 }
 
+/* R320 only takes HH:MM. Do other phones understand full date? */
+GSM_Error ATGEN_SetAlarm(GSM_StateMachine *s, GSM_Alarm *alarm)
+{
+	char req[20];
+
+	if (alarm->Location != 1) return ERR_INVALIDLOCATION;
+
+	sprintf(req, "AT+CALA=\"%02i:%02i\"\r",alarm->DateTime.Hour,alarm->DateTime.Minute);
+
+	smprintf(s, "Setting Alarm\n");
+	return GSM_WaitFor (s, req, strlen(req), 0x00, 3, ID_SetAlarm);
+}
+
 GSM_Error ATGEN_ReplyGetSMSC(GSM_Protocol_Message msg, GSM_StateMachine *s)
 {
 	GSM_SMSC		*SMSC = s->Phone.Data.SMSC;
 	int			current;
 	int			len;
 	unsigned char 		buffer[100];
 
 	switch (s->Phone.Data.Priv.ATGEN.ReplyState) {
 	case AT_Reply_OK:
 		smprintf(s, "SMSC info received\n");
 
 		current = 0;
@@ -2193,24 +2262,26 @@ GSM_Error ATGEN_GetMemoryInfo(GSM_StateMachine *s, GSM_MemoryStatus *Status, GSM
 	char			req[20];
 	int			start;
 	int			end;
 	GSM_Phone_ATGENData 	*Priv = &s->Phone.Data.Priv.ATGEN;
 
 	smprintf(s, "Getting memory information\n");
 	
 	Priv->MemorySize		= 0;
 	Priv->TextLength		= 0;
 	Priv->NumberLength		= 0;
 
 	error = GSM_WaitFor (s, "AT+CPBR=?\r", 10, 0x00, 4, ID_GetMemoryStatus);
+	if (Priv->Manufacturer == AT_Samsung)
+		error = GSM_WaitFor (s, "", 0, 0x00, 4, ID_GetMemoryStatus);
 	if (error != ERR_NONE) return error;
 	if (NeededInfo == AT_Total || NeededInfo == AT_Sizes || NeededInfo == AT_First) return ERR_NONE;
 
 	smprintf(s, "Getting memory status by reading values\n");
 	
 	s->Phone.Data.MemoryStatus	= Status;
 	Status->MemoryUsed		= 0;
 	Status->MemoryFree		= 0;
 	start				= Priv->FirstMemoryEntry;
 	Priv->NextMemoryEntry		= 0;
 	while (1) {
 		end	= start + 20;
@@ -2259,24 +2330,30 @@ GSM_Error ATGEN_SetPBKCharset(GSM_StateMachine *s, bool PreferUnicode)
 		/* If we want unicode charset and we have it already or setting of it
 		 * failed, we have nothing to do. */
 		if (PreferUnicode  && (Priv->PBKCharset==AT_PBK_UCS2 || Priv->UCS2CharsetFailed)) return ERR_NONE;
 
 		/* If we don't need unicode charset and we have some (or have unicode
 		 * charset when other failed), we have nothing to do. */
 		if (!PreferUnicode && (Priv->PBKCharset!=AT_PBK_UCS2 || Priv->NonUCS2CharsetFailed)) return ERR_NONE;
 	}
 
 	error=ATGEN_GetManufacturer(s);
 	if (error != ERR_NONE) return error;
 
+	/* Samsung (and Sagem?) phones use only PCCP437? */
+	if (Priv->Manufacturer == AT_Samsung) {
+		Priv->PBKCharset = AT_PBK_PCCP437;
+		return ERR_NONE;
+	}
+
 	if (PreferUnicode && !Priv->UCS2CharsetFailed) {
 		smprintf(s, "Setting charset to UCS2\n");
 		error=GSM_WaitFor (s, "AT+CSCS=\"UCS2\"\r", 15, 0x00, 3, ID_SetMemoryCharset);
 		if (error == ERR_NONE) {
 			Priv->PBKCharset = AT_PBK_UCS2;
 			return ERR_NONE;
 		} else {
 			Priv->UCS2CharsetFailed = true;
 		}
 	}
 	
 	smprintf(s, "Setting charset to HEX\n");
@@ -2376,25 +2453,55 @@ GSM_Error ATGEN_ReplyGetMemory(GSM_Protocol_Message msg, GSM_StateMachine *s)
  		Memory->Entries[1].EntryType=PBK_Text_Name;
 		switch (Priv->PBKCharset) {
 		case AT_PBK_HEX:
 			DecodeHexBin(buffer2,buffer+1,strlen(buffer)-2);
  			DecodeDefault(Memory->Entries[1].Text,buffer2,strlen(buffer2),false,NULL);
 			break;
 		case AT_PBK_GSM:
  			DecodeDefault(Memory->Entries[1].Text,buffer+1,strlen(buffer)-2,false,NULL);
 			break;			
 		case AT_PBK_UCS2:
 			DecodeHexUnicode(Memory->Entries[1].Text,buffer+1,strlen(buffer+1) - 1);
 			break;			
+		case AT_PBK_PCCP437:
+			/* FIXME: correctly decode PCCP437 */
+ 			DecodeDefault(Memory->Entries[1].Text,buffer+1,strlen(buffer)-2,false,NULL);
+			break;
+		}
+
+		/* Samsung number type */
+		if (Priv->Manufacturer == AT_Samsung) {
+			int type;
+
+			pos += ATGEN_ExtractOneParameter(pos, buffer);
+ 			smprintf(s, "Number type: %s\n",buffer);
+			type = strtoul(buffer, NULL, 0);
+			switch (type) {
+			case 0:
+ 				Memory->Entries[0].EntryType = PBK_Number_Mobile;
+				break;
+			case 1:
+ 				Memory->Entries[0].EntryType = PBK_Number_Work;
+				break;
+			case 2:
+ 				Memory->Entries[0].EntryType = PBK_Number_Home;
+				break;
+			case 3:
+ 				Memory->Entries[0].EntryType = PBK_Text_Email;
+				break;
+			default:
+ 				Memory->Entries[0].EntryType = PBK_Number_General;
+			}
 		}
+
 		return ERR_NONE;
 	case AT_Reply_CMEError:
 		return ATGEN_HandleCMEError(s);
 	case AT_Reply_Error:
  		smprintf(s, "Error - too high location ?\n");
 		return ERR_INVALIDLOCATION;
 	case AT_Reply_CMSError:
  	        return ATGEN_HandleCMSError(s);
 	default:
 		break;
 	}
 	return ERR_UNKNOWNRESPONSE;
@@ -2553,24 +2660,26 @@ GSM_Error ATGEN_DialVoice(GSM_StateMachine *s, char *number, GSM_CallShowNumber
 
 GSM_Error ATGEN_ReplyEnterSecurityCode(GSM_Protocol_Message msg, GSM_StateMachine *s)
 {
 	switch (s->Phone.Data.Priv.ATGEN.ReplyState) {
 	case AT_Reply_OK:
 		smprintf(s, "Security code was OK\n");
 		return ERR_NONE;
 	case AT_Reply_Error:
 		smprintf(s, "Incorrect security code\n");
 		return ERR_SECURITYERROR;
 	case AT_Reply_CMSError:
 	        return ATGEN_HandleCMSError(s);
+	case AT_Reply_CMEError:
+	        return ATGEN_HandleCMEError(s);
 	default:
 		break;
 	}
 	return ERR_UNKNOWNRESPONSE;
 }
 
 GSM_Error ATGEN_EnterSecurityCode(GSM_StateMachine *s, GSM_SecurityCode Code)
 {
 	unsigned char req[50];
 
 	switch (Code.Type) {
 	case SEC_Pin :
@@ -2915,24 +3024,30 @@ GSM_Error ATGEN_PrivSetMemory(GSM_StateMachine *s, GSM_MemoryEntry *entry)
 			EncodeHexBin(name, DecodeUnicodeString(entry->Entries[Name].Text), UnicodeLength(entry->Entries[Name].Text));
 			len = strlen(name);
 			break;
 		case AT_PBK_GSM:
 			smprintf(s, "str: %s\n", DecodeUnicodeString(entry->Entries[Name].Text));
 			len = UnicodeLength(entry->Entries[Name].Text);
 			EncodeDefault(name, entry->Entries[Name].Text, &len, true, NULL);
 			break;
 		case AT_PBK_UCS2:
 			EncodeHexUnicode(name, entry->Entries[Name].Text, UnicodeLength(entry->Entries[Name].Text));
 			len = strlen(name);
 			break;
+		case AT_PBK_PCCP437:
+			/* FIXME: correctly decode PCCP437 */
+			smprintf(s, "str: %s\n", DecodeUnicodeString(entry->Entries[Name].Text));
+			len = UnicodeLength(entry->Entries[Name].Text);
+			EncodeDefault(name, entry->Entries[Name].Text, &len, true, NULL);
+			break;
 		}
 	} else {
 		smprintf(s, "WARNING: No usable name found!\n");
 		len = 0;
 	}
 
 	if (Number != -1) {
 		GSM_PackSemiOctetNumber(entry->Entries[Number].Text, number, false);
 		NumberType = number[0];
 		sprintf(number,"%s",DecodeUnicodeString(entry->Entries[Number].Text));
 	} else {
 		smprintf(s, "WARNING: No usable number found!\n");
@@ -3243,24 +3358,61 @@ GSM_Error ATGEN_AddCalendarNote(GSM_StateMachine *s, GSM_CalendarEntry *Note)
 	return ERR_NOTSUPPORTED;
 }
 
 GSM_Error ATGEN_DelCalendarNote(GSM_StateMachine *s, GSM_CalendarEntry *Note)
 {
 	GSM_Phone_ATGENData *Priv = &s->Phone.Data.Priv.ATGEN;
 
 	if (Priv->Manufacturer==AT_Siemens)  return SIEMENS_DelCalendarNote(s, Note);
 	if (Priv->Manufacturer==AT_Ericsson) return SONYERIC_DelCalendarNote(s, Note);
 	return ERR_NOTSUPPORTED;
 }
 
+
+GSM_Error ATGEN_GetBitmap(GSM_StateMachine *s, GSM_Bitmap *Bitmap)
+{
+	GSM_Phone_ATGENData	*Priv = &s->Phone.Data.Priv.ATGEN;
+
+	if (Priv->Manufacturer==AT_Siemens) return SIEMENS_GetBitmap(s, Bitmap);
+	if (Priv->Manufacturer==AT_Samsung) return SAMSUNG_GetBitmap(s, Bitmap);
+	return ERR_NOTSUPPORTED;
+}
+
+GSM_Error ATGEN_SetBitmap(GSM_StateMachine *s, GSM_Bitmap *Bitmap)
+{
+	GSM_Phone_ATGENData	*Priv = &s->Phone.Data.Priv.ATGEN;
+
+	if (Priv->Manufacturer==AT_Siemens) return SIEMENS_SetBitmap(s, Bitmap);
+	if (Priv->Manufacturer==AT_Samsung) return SAMSUNG_SetBitmap(s, Bitmap);
+	return ERR_NOTSUPPORTED;
+}
+
+GSM_Error ATGEN_GetRingtone(GSM_StateMachine *s, GSM_Ringtone *Ringtone, bool PhoneRingtone)
+{
+	GSM_Phone_ATGENData	*Priv = &s->Phone.Data.Priv.ATGEN;
+
+	if (Priv->Manufacturer==AT_Siemens) return SIEMENS_GetRingtone(s, Ringtone, PhoneRingtone);
+	if (Priv->Manufacturer==AT_Samsung) return SAMSUNG_GetRingtone(s, Ringtone, PhoneRingtone);
+	return ERR_NOTSUPPORTED;
+}
+
+GSM_Error ATGEN_SetRingtone(GSM_StateMachine *s, GSM_Ringtone *Ringtone, int *maxlength)
+{
+	GSM_Phone_ATGENData	*Priv = &s->Phone.Data.Priv.ATGEN;
+
+	if (Priv->Manufacturer==AT_Siemens) return SIEMENS_SetRingtone(s, Ringtone, maxlength);
+	if (Priv->Manufacturer==AT_Samsung) return SAMSUNG_SetRingtone(s, Ringtone, maxlength);
+	return ERR_NOTSUPPORTED;
+}
+
 GSM_Error ATGEN_PressKey(GSM_StateMachine *s, GSM_KeyCode Key, bool Press)
 {
 	GSM_Error	error;
 	unsigned char 	Frame[] = "AT+CKPD=\"?\"\r";
 
 	if (Press) {
 		switch (Key) {
 			case GSM_KEY_1 			: Frame[9] = '1'; break;
 			case GSM_KEY_2			: Frame[9] = '2'; break;
 			case GSM_KEY_3			: Frame[9] = '3'; break;
 			case GSM_KEY_4			: Frame[9] = '4'; break;
 			case GSM_KEY_5			: Frame[9] = '5'; break;
@@ -3337,24 +3489,35 @@ GSM_Error ATGEN_SetIncomingCB(GSM_StateMachine *s, bool enable)
 			return GSM_WaitFor(s, "AT+CNMI=3,,2\r", 13, 0x00, 4, ID_SetIncomingCB);
 		} else {
 			smprintf(s, "Disabling incoming CB\n");
 			return GSM_WaitFor(s, "AT+CNMI=3,,0\r", 13, 0x00, 4, ID_SetIncomingCB);
 		}
 	}
 	return ERR_NONE;
 #else
 	return ERR_SOURCENOTAVAILABLE;
 #endif
 }
 
+GSM_Error ATGEN_SetFastSMSSending(GSM_StateMachine *s, bool enable)
+{
+	if (enable) {
+		smprintf(s, "Enabling fast SMS sending\n");
+		return GSM_WaitFor(s, "AT+CMMS=2\r", 10, 0x00, 4, ID_SetFastSMSSending);
+	} else {
+		smprintf(s, "Disabling fast SMS sending\n");
+		return GSM_WaitFor(s, "AT+CMMS=0\r", 10, 0x00, 4, ID_SetFastSMSSending);
+	}
+}
+
 GSM_Error ATGEN_IncomingSMSInfo(GSM_Protocol_Message msg, GSM_StateMachine *s)
 {
 	smprintf(s, "Incoming SMS\n");
 	return ERR_NONE;
 }
 
 GSM_Error ATGEN_IncomingSMSDeliver(GSM_Protocol_Message msg, GSM_StateMachine *s)
 {
 	GSM_Phone_Data		*Data = &s->Phone.Data;
 	GSM_SMSMessage 		sms;
 	int 			current = 0, current2, i=0;
 	unsigned char 		buffer[300],smsframe[800];
@@ -3415,32 +3578,49 @@ GSM_Error ATGEN_SetIncomingSMS(GSM_StateMachine *s, bool enable)
 			GSM_WaitFor(s, "AT+CNMI=3,,,1\r", 14, 0x00, 4, ID_SetIncomingSMS);
 
 			/* SMS deliver */
 			return GSM_WaitFor(s, "AT+CNMI=3,3\r", 12, 0x00, 4, ID_SetIncomingSMS);
 		} else {
 			smprintf(s, "Disabling incoming SMS\n");
 			return GSM_WaitFor(s, "AT+CNMI=3,0\r", 12, 0x00, 4, ID_SetIncomingSMS);
 		}
 	}
 	return ERR_NONE;
 }
 
+GSM_Error ATGEN_GetLocale(GSM_StateMachine *s, GSM_Locale *locale)
+{
+	if (s->Phone.Data.Priv.ATGEN.Manufacturer==AT_Ericsson) return ERICSSON_GetLocale(s,locale);
+	return ERR_NOTSUPPORTED;
+}
+
+GSM_Error ATGEN_SetLocale(GSM_StateMachine *s, GSM_Locale *locale)
+{
+	if (s->Phone.Data.Priv.ATGEN.Manufacturer==AT_Ericsson) return ERICSSON_SetLocale(s,locale);
+	return ERR_NOTSUPPORTED;
+}
+
 GSM_Reply_Function ATGENReplyFunctions[] = {
 {ATGEN_GenericReply,		"AT\r"			,0x00,0x00,ID_IncomingFrame	 },
 {ATGEN_GenericReply,		"ATE1" 	 		,0x00,0x00,ID_EnableEcho	 },
 {ATGEN_GenericReply,		"AT+CMEE=" 		,0x00,0x00,ID_EnableErrorInfo	 },
 {ATGEN_GenericReply,		"AT+CKPD="		,0x00,0x00,ID_PressKey		 },
 {ATGEN_ReplyGetSIMIMSI,		"AT+CIMI" 	 	,0x00,0x00,ID_GetSIMIMSI	 },
 {ATGEN_GenericReply,		"AT*EOBEX"		,0x00,0x00,ID_SetOBEX		 },
 
+{ERICSSON_ReplyGetDateLocale,	"*ESDF:"		,0x00,0x00,ID_GetLocale		 },
+{ERICSSON_ReplyGetTimeLocale,	"*ESTF:"		,0x00,0x00,ID_GetLocale	 	 },
+{ATGEN_GenericReply,		"AT*ESDF="		,0x00,0x00,ID_SetLocale		 },
+{ATGEN_GenericReply,		"AT*ESTF="		,0x00,0x00,ID_SetLocale		 },
+
 #ifdef GSM_ENABLE_CELLBROADCAST
 {ATGEN_ReplyIncomingCB,		"+CBM:" 	 	,0x00,0x00,ID_IncomingFrame	 },
 {ATGEN_GenericReply,		"AT+CNMI"		,0x00,0x00,ID_SetIncomingCB	 },
 #endif
 
 {ATGEN_IncomingBattery,		"_OBS:"		 	,0x00,0x00,ID_IncomingFrame      },
 {ATGEN_ReplyGetBatteryCharge,	"AT+CBC"		,0x00,0x00,ID_GetBatteryCharge	 },
 
 {ATGEN_ReplyGetModel,		"AT+CGMM"		,0x00,0x00,ID_GetModel           },
 {ATGEN_ReplyGetManufacturer,	"AT+CGMI"		,0x00,0x00,ID_GetManufacturer	 },
 {ATGEN_ReplyGetFirmwareCGMR,	"AT+CGMR"		,0x00,0x00,ID_GetFirmware	 },
 {ATGEN_ReplyGetFirmwareATI,	"ATI"			,0x00,0x00,ID_GetFirmware	 },
@@ -3453,122 +3633,134 @@ GSM_Reply_Function ATGENReplyFunctions[] = {
 {ATGEN_GenericReply,		"AT+CSDH"		,0x00,0x00,ID_GetSMSMode	 },
 {ATGEN_ReplyGetSMSMessage,	"AT+CMGR"		,0x00,0x00,ID_GetSMSMessage	 },
 {ATGEN_GenericReply,		"AT+CPMS"		,0x00,0x00,ID_SetMemoryType	 },
 {ATGEN_ReplyGetSMSStatus,	"AT+CPMS"		,0x00,0x00,ID_GetSMSStatus	 },
 {ATGEN_ReplyGetSMSMemories,	"AT+CPMS=?"		,0x00,0x00,ID_GetSMSMemories	 },
 {ATGEN_ReplyAddSMSMessage,	"AT+CMGW"		,0x00,0x00,ID_SaveSMSMessage	 },
 {ATGEN_GenericReply,		"AT+CSMP"		,0x00,0x00,ID_SetSMSParameters	 },
 {ATGEN_GenericReply,		"AT+CSCA"		,0x00,0x00,ID_SetSMSC		 },
 {ATGEN_ReplyGetSMSC,		"AT+CSCA?"		,0x00,0x00,ID_GetSMSC		 },
 {ATGEN_ReplyDeleteSMSMessage,	"AT+CMGD"		,0x00,0x00,ID_DeleteSMSMessage	 },
 {ATGEN_GenericReply,		"ATE1"			,0x00,0x00,ID_SetSMSParameters	 },
 {ATGEN_GenericReply,		"\x1b\x0D"		,0x00,0x00,ID_SetSMSParameters	 },
+{ATGEN_GenericReply,		"AT+CMMS"		,0x00,0x00,ID_SetFastSMSSending  },
 {ATGEN_IncomingSMSInfo,		"+CMTI:" 	 	,0x00,0x00,ID_IncomingFrame	 },
 {ATGEN_IncomingSMSDeliver,	"+CMT:" 	 	,0x00,0x00,ID_IncomingFrame	 },
 {ATGEN_IncomingSMSReport,	"+CDS:" 	 	,0x00,0x00,ID_IncomingFrame	 },
 {ATGEN_IncomingSMSCInfo,	"^SCN:"			,0x00,0x00,ID_IncomingFrame	 },
 
 {ATGEN_ReplyGetDateTime_Alarm,	"AT+CCLK?"		,0x00,0x00,ID_GetDateTime	 },
 {ATGEN_GenericReply,		"AT+CCLK="		,0x00,0x00,ID_SetDateTime	 },
+{ATGEN_GenericReply,		"AT+CALA="		,0x00,0x00,ID_SetAlarm		 },
 {ATGEN_ReplyGetDateTime_Alarm,	"AT+CALA?"		,0x00,0x00,ID_GetAlarm		 },
 
 {ATGEN_ReplyGetNetworkLAC_CID,	"AT+CREG?"		,0x00,0x00,ID_GetNetworkInfo	 },
 {ATGEN_GenericReply,		"AT+CREG=2"		,0x00,0x00,ID_GetNetworkInfo	 },
 {ATGEN_GenericReply,		"AT+COPS="		,0x00,0x00,ID_GetNetworkInfo	 },
 {ATGEN_GenericReply,		"AT+COPS="		,0x00,0x00,ID_SetAutoNetworkLogin},
 {ATGEN_ReplyGetNetworkCode,	"AT+COPS"		,0x00,0x00,ID_GetNetworkInfo	 },
 {ATGEN_ReplyGetSignalQuality,	"AT+CSQ"		,0x00,0x00,ID_GetSignalQuality	 },
 {ATGEN_IncomingNetworkLevel,	"_OSIGQ:"	 	,0x00,0x00,ID_IncomingFrame	 },
 {ATGEN_IncomingGPRS,		"+CGREG:"	 	,0x00,0x00,ID_IncomingFrame      },
 {ATGEN_ReplyGetNetworkLAC_CID,	"+CREG:"		,0x00,0x00,ID_IncomingFrame	 },
 
 {ATGEN_ReplyGetPBKMemories,	"AT+CPBS=?"		,0x00,0x00,ID_SetMemoryType	 },
 {ATGEN_GenericReply,		"AT+CPBS="		,0x00,0x00,ID_SetMemoryType	 },
 {ATGEN_ReplyGetCPBSMemoryStatus,"AT+CPBS?"		,0x00,0x00,ID_GetMemoryStatus	 },
+// /* Samsung phones reply +CPBR: after OK --claudio*/
 {ATGEN_ReplyGetCPBRMemoryInfo,	"AT+CPBR=?"		,0x00,0x00,ID_GetMemoryStatus	 },
+{ATGEN_ReplyGetCPBRMemoryInfo,	"+CPBR:"		,0x00,0x00,ID_GetMemoryStatus	 },
 {ATGEN_ReplyGetCPBRMemoryStatus,"AT+CPBR="		,0x00,0x00,ID_GetMemoryStatus	 },
 {ATGEN_GenericReply,		"AT+CSCS="		,0x00,0x00,ID_SetMemoryCharset	 },
 {ATGEN_ReplyGetMemory,		"AT+CPBR="		,0x00,0x00,ID_GetMemory		 },
 {ATGEN_GenericReply,		"AT^SBNR=?"		,0x00,0x00,ID_GetMemory		 },
-{ATGEN_SL45ReplyGetMemory,	"AT^SBNR"		,0x00,0x00,ID_GetMemory		 },
+{SIEMENS_ReplyGetMemory,	"AT^SBNR"		,0x00,0x00,ID_GetMemory		 },
 {ATGEN_ReplySetMemory,		"AT+CPBW"		,0x00,0x00,ID_SetMemory		 },
 
-{ATGEN_CMS35ReplyGetBitmap,	"AT^SBNR=\"bmp\""	,0x00,0x00,ID_GetBitmap	 	 },
-{ATGEN_CMS35ReplySetBitmap,	"AT^SBNW=\"bmp\""	,0x00,0x00,ID_SetBitmap	 	 },
+{SIEMENS_ReplyGetBitmap,	"AT^SBNR=\"bmp\""	,0x00,0x00,ID_GetBitmap	 	 },
+{SIEMENS_ReplySetBitmap,	"AT^SBNW=\"bmp\""	,0x00,0x00,ID_SetBitmap	 	 },
 
-{ATGEN_CMS35ReplyGetRingtone,	"AT^SBNR=\"mid\""	,0x00,0x00,ID_GetRingtone	 },
-{ATGEN_CMS35ReplySetRingtone,	"AT^SBNW=\"mid\""	,0x00,0x00,ID_SetRingtone	 },
+{SIEMENS_ReplyGetRingtone,	"AT^SBNR=\"mid\""	,0x00,0x00,ID_GetRingtone	 },
+{SIEMENS_ReplySetRingtone,	"AT^SBNW=\"mid\""	,0x00,0x00,ID_SetRingtone	 },
 
-{ATGEN_CMS35ReplyGetNextCal,	"AT^SBNR=\"vcs\""	,0x00,0x00,ID_GetCalendarNote	 },
-{ATGEN_CMS35ReplySetCalendar,	"AT^SBNW=\"vcs\""	,0x00,0x00,ID_SetCalendarNote	 },
-{ATGEN_CMS35ReplyDeleteCalendar,"AT^SBNW=\"vcs\""	,0x00,0x00,ID_DeleteCalendarNote },
+{SIEMENS_ReplyGetNextCalendar,	"AT^SBNR=\"vcs\""	,0x00,0x00,ID_GetCalendarNote	 },
+{SIEMENS_ReplyAddCalendarNote,	"AT^SBNW=\"vcs\""	,0x00,0x00,ID_SetCalendarNote	 },
+{SIEMENS_ReplyDelCalendarNote,	"AT^SBNW=\"vcs\""	,0x00,0x00,ID_DeleteCalendarNote },
 
 {ATGEN_ReplyEnterSecurityCode,	"AT+CPIN="		,0x00,0x00,ID_EnterSecurityCode	 },
 {ATGEN_ReplyEnterSecurityCode,	"AT+CPIN2="		,0x00,0x00,ID_EnterSecurityCode	 },
 {ATGEN_ReplyGetSecurityStatus,	"AT+CPIN?"		,0x00,0x00,ID_GetSecurityStatus	 },
 {ATGEN_ReplyOK,			"OK"			,0x00,0x00,ID_IncomingFrame	 },
 
 {ATGEN_GenericReply, 		"AT+VTS"		,0x00,0x00,ID_SendDTMF		 },
 {ATGEN_ReplyCancelCall,		"AT+CHUP"		,0x00,0x00,ID_CancelCall	 },
 {ATGEN_ReplyDialVoice,		"ATDT"			,0x00,0x00,ID_DialVoice		 },
 {ATGEN_ReplyCancelCall,		"ATH"			,0x00,0x00,ID_CancelCall	 },
+{ATGEN_GenericReply, 		"AT+CUSD"		,0x00,0x00,ID_SetUSSD		 },
+{ATGEN_ReplyGetUSSD, 		"+CUSD"			,0x00,0x00,ID_IncomingFrame	 },
 {ATGEN_GenericReply,            "AT+CLIP=1"      	,0x00,0x00,ID_IncomingFrame      },
 {ATGEN_ReplyIncomingCallInfo,	"+CLIP"			,0x00,0x00,ID_IncomingFrame	 },
 {ATGEN_ReplyIncomingCallInfo,	"+COLP"    		,0x00,0x00,ID_IncomingFrame	 },
 {ATGEN_ReplyIncomingCallInfo,	"RING"			,0x00,0x00,ID_IncomingFrame	 },
 {ATGEN_ReplyIncomingCallInfo,	"NO CARRIER"		,0x00,0x00,ID_IncomingFrame	 },
 
 {ATGEN_ReplyReset,		"AT^SRESET"		,0x00,0x00,ID_Reset		 },
 {ATGEN_ReplyReset,		"AT+CFUN=1,1"		,0x00,0x00,ID_Reset		 },
 {ATGEN_ReplyResetPhoneSettings, "AT&F"			,0x00,0x00,ID_ResetPhoneSettings },
 
+{SAMSUNG_ReplyGetBitmap,	"AT+IMGR="		,0x00,0x00,ID_GetBitmap	 	 },
+{SAMSUNG_ReplySetBitmap,	"SDNDCRC ="		,0x00,0x00,ID_SetBitmap		 },
+
+{SAMSUNG_ReplyGetRingtone,	"AT+MELR="		,0x00,0x00,ID_GetRingtone	 },
+{SAMSUNG_ReplySetRingtone,	"SDNDCRC ="		,0x00,0x00,ID_SetRingtone	 },
+
 #ifdef GSM_ENABLE_ALCATEL
 /*  Why do I give Alcatel specific things here? It's simple, Alcatel needs
  *  some AT commands to start it's binary mode, so this needs to be in AT
  *  related stuff. 
  *
  *  XXX: AT+IFC could later move outside this ifdef, because it is not Alcatel
  *  specific and it's part of ETSI specifications 
  */
 {ATGEN_GenericReply,		"AT+IFC" 	 	,0x00,0x00,ID_SetFlowControl  	 },
 {ALCATEL_ProtocolVersionReply,	"AT+CPROT=?" 	 	,0x00,0x00,ID_AlcatelProtocol    },
 {ATGEN_GenericReply,		"AT+CPROT" 	 	,0x00,0x00,ID_AlcatelConnect	 },
 #endif
 
 {NULL,				"\x00"			,0x00,0x00,ID_None		 }
 };                                                                                      
 
 GSM_Phone_Functions ATGENPhone = {
-	"A2D|iPAQ|at|M20|S25|MC35|C35i|5110|5130|5190|5210|6110|6130|6150|6190|6210|6250|6310|6310i|6510|7110|8210|8250|8290|8310|8390|8850|8855|8890|8910|9110|9210",
+	"A2D|iPAQ|at|M20|S25|MC35|TC35|C35i|S300|5110|5130|5190|5210|6110|6130|6150|6190|6210|6250|6310|6310i|6510|7110|8210|8250|8290|8310|8390|8850|8855|8890|8910|9110|9210",
 	ATGENReplyFunctions,
 	ATGEN_Initialise,
 	ATGEN_Terminate,
 	ATGEN_DispatchMessage,
 	NOTSUPPORTED,			/* 	ShowStartInfo		*/
 	ATGEN_GetManufacturer,
 	ATGEN_GetModel,
 	ATGEN_GetFirmware,
 	ATGEN_GetIMEI,
 	NOTSUPPORTED,			/*	GetOriginalIMEI		*/
 	NOTSUPPORTED,			/*	GetManufactureMonth	*/
 	NOTSUPPORTED,			/*	GetProductCode		*/
 	NOTSUPPORTED,			/*	GetHardware		*/
 	NOTSUPPORTED,			/*	GetPPM			*/
 	ATGEN_GetSIMIMSI,
 	ATGEN_GetDateTime,
 	ATGEN_SetDateTime,
 	ATGEN_GetAlarm,
-	NOTIMPLEMENTED,			/*	SetAlarm		*/
-	NOTSUPPORTED,			/* 	GetLocale		*/
-	NOTSUPPORTED,			/* 	SetLocale		*/
+	ATGEN_SetAlarm,
+	ATGEN_GetLocale,
+	ATGEN_SetLocale,
 	ATGEN_PressKey,
 	ATGEN_Reset,
 	ATGEN_ResetPhoneSettings,
 	ATGEN_EnterSecurityCode,
 	ATGEN_GetSecurityStatus,
 	ATGEN_GetDisplayStatus,
 	ATGEN_SetAutoNetworkLogin,
 	ATGEN_GetBatteryCharge,
 	ATGEN_GetSignalQuality,
 	ATGEN_GetNetworkInfo,
  	NOTSUPPORTED,       		/*  	GetCategory 		*/
  	NOTSUPPORTED,       		/*  	AddCategory 		*/
@@ -3583,43 +3775,44 @@ GSM_Phone_Functions ATGENPhone = {
 	NOTSUPPORTED,			/*	GetSpeedDial		*/
 	NOTSUPPORTED,			/*	SetSpeedDial		*/
 	ATGEN_GetSMSC,
 	ATGEN_SetSMSC,
 	ATGEN_GetSMSStatus,
 	ATGEN_GetSMS,
 	ATGEN_GetNextSMS,
 	NOTSUPPORTED,			/*	SetSMS			*/
 	ATGEN_AddSMS,
 	ATGEN_DeleteSMS,
 	ATGEN_SendSMS,
 	ATGEN_SendSavedSMS,
+	ATGEN_SetFastSMSSending,
 	ATGEN_SetIncomingSMS,
 	ATGEN_SetIncomingCB,
 	ATGEN_GetSMSFolders,
  	NOTSUPPORTED,			/* 	AddSMSFolder		*/
  	NOTSUPPORTED,			/* 	DeleteSMSFolder		*/
 	ATGEN_DialVoice,
 	ATGEN_AnswerCall,
 	ATGEN_CancelCall,
  	NOTSUPPORTED,			/* 	HoldCall 		*/
  	NOTSUPPORTED,			/* 	UnholdCall 		*/
  	NOTSUPPORTED,			/* 	ConferenceCall 		*/
  	NOTSUPPORTED,			/* 	SplitCall		*/
  	NOTSUPPORTED,			/* 	TransferCall		*/
  	NOTSUPPORTED,			/* 	SwitchCall		*/
  	NOTSUPPORTED,			/* 	GetCallDivert		*/
  	NOTSUPPORTED,			/* 	SetCallDivert		*/
  	NOTSUPPORTED,			/* 	CancelAllDiverts	*/
 	NONEFUNCTION,			/*	SetIncomingCall		*/
-	NOTSUPPORTED,			/* 	SetIncomingUSSD		*/
+	ATGEN_SetIncomingUSSD,
 	ATGEN_SendDTMF,
 	ATGEN_GetRingtone,
 	ATGEN_SetRingtone,
 	NOTSUPPORTED,			/*	GetRingtonesInfo	*/
 	NOTSUPPORTED,			/* 	DeleteUserRingtones	*/
 	NOTSUPPORTED,			/*	PlayTone		*/
 	NOTSUPPORTED,			/* 	GetWAPBookmark		*/
 	NOTSUPPORTED,			/* 	SetWAPBookmark 		*/
 	NOTSUPPORTED,	 		/* 	DeleteWAPBookmark 	*/
 	NOTSUPPORTED,			/* 	GetWAPSettings 		*/
 	NOTSUPPORTED,			/* 	SetWAPSettings 		*/
 	NOTSUPPORTED,			/* 	GetMMSSettings		*/
@@ -3637,25 +3830,25 @@ GSM_Phone_Functions ATGENPhone = {
 	SONYERIC_AddToDo,
 	NOTSUPPORTED,			/*	DeleteToDo		*/
 	SONYERIC_DeleteAllToDo,
 	SONYERIC_GetCalendarStatus,
 	NOTIMPLEMENTED,			/*	GetCalendar		*/
     	ATGEN_GetNextCalendar,
 	NOTIMPLEMENTED,			/*	SetCalendar		*/
 	ATGEN_AddCalendarNote,
 	ATGEN_DelCalendarNote,
 	NOTIMPLEMENTED,			/*	DeleteAllCalendar	*/
 	NOTSUPPORTED,			/* 	GetCalendarSettings	*/
 	NOTSUPPORTED,			/* 	SetCalendarSettings	*/
-	NOTSUPPORTED,			/*	GetNote			*/
+	NOTSUPPORTED,			/*	GetNextNote		*/
 	NOTSUPPORTED, 			/*	GetProfile		*/
 	NOTSUPPORTED, 			/*	SetProfile		*/
     	NOTSUPPORTED,			/*  	GetFMStation        	*/
     	NOTSUPPORTED,			/* 	SetFMStation        	*/
     	NOTSUPPORTED,			/* 	ClearFMStations       	*/
 	NOTSUPPORTED,			/* 	GetNextFileFolder	*/
 	NOTSUPPORTED,			/* 	GetFilePart		*/
 	NOTSUPPORTED,			/* 	AddFile			*/
 	NOTSUPPORTED, 			/* 	GetFileSystemStatus	*/
 	NOTSUPPORTED,			/* 	DeleteFile		*/
 	NOTSUPPORTED,			/* 	AddFolder		*/
 	NOTSUPPORTED,			/* 	GetGPRSAccessPoint	*/
diff --git a/gammu/emb/common/phone/at/atgen.h b/gammu/emb/common/phone/at/atgen.h
index 0e08ee4..bb5c559 100644
--- a/gammu/emb/common/phone/at/atgen.h
+++ b/gammu/emb/common/phone/at/atgen.h
@@ -33,31 +33,33 @@ typedef enum {
 	AT_Reply_CMEError,
 	AT_Reply_SMSEdit
 } GSM_AT_Reply_State;
 
 typedef enum {
 	AT_Nokia = 1,
 	AT_Alcatel,
 	AT_Siemens,
 	AT_HP,
 	AT_Falcom,
 	AT_Ericsson,
 	AT_Sagem,
+	AT_Samsung,
 	AT_Unknown
 } GSM_AT_Manufacturer;
 
 typedef enum {
 	AT_PBK_HEX = 1,
 	AT_PBK_GSM,
-	AT_PBK_UCS2
+	AT_PBK_UCS2,
+	AT_PBK_PCCP437
 } GSM_AT_PBK_Charset;
 
 typedef enum {
 	AT_AVAILABLE = 1,
 	AT_NOTAVAILABLE
 } GSM_AT_SMSMemory;
 
 typedef enum {
 	AT_SBNR_AVAILABLE = 1,
 	AT_SBNR_NOTAVAILABLE
 } GSM_AT_SBNR;
 
@@ -94,17 +96,21 @@ typedef struct {
 	int			LastSMSRead;
 	int			FirstCalendarPos;
 	bool			CanSaveSMS;
 	GSM_AT_SMSMemory	PhoneSMSMemory;	  	/* Is phone SMS memory available ? 				*/
 	GSM_AT_SMSMemory	SIMSMSMemory;	  	/* Is SIM SMS memory available ? 				*/
 	GSM_MemoryType		SMSMemory;	  	/* Last read SMS memory 					*/
 	GSM_AT_SMS_Modes	SMSMode;	  	/* PDU or TEXT mode for SMS ? 					*/
 
 	bool			OBEX;
 	GSM_File		file;
 } GSM_Phone_ATGENData;
 
+GSM_Error ATGEN_HandleCMSError	(GSM_StateMachine *);
+GSM_Error ATGEN_HandleCMEError	(GSM_StateMachine *);
+GSM_Error ATGEN_DispatchMessage	(GSM_StateMachine *);
+
 #endif
 
 /* How should editor hadle tabs in this file? Add editor commands here.
  * vim: noexpandtab sw=8 ts=8 sts=8:
  */
diff --git a/gammu/emb/common/phone/at/samsung.c b/gammu/emb/common/phone/at/samsung.c
new file mode 100644
index 0000000..55a42e5
--- a/dev/null
+++ b/gammu/emb/common/phone/at/samsung.c
@@ -0,0 +1,447 @@
+/* Samsung-specific functions
+ * Copyright (C) 2004 Claudio Matsuoka <cmatsuoka@gmail.com>
+ * Tested with S300 only!
+ */
+                                           
+#include "../../gsmstate.h"
+
+#ifdef GSM_ENABLE_ATGEN
+
+#include <string.h>
+#include <time.h>
+#include <ctype.h>
+
+#include "../../misc/coding/coding.h"
+#include "../../gsmcomon.h"
+#include "../../service/sms/gsmsms.h"
+#include "../pfunc.h"
+
+#include "atgen.h"
+#include "samsung.h"
+
+/* Binary frame size */
+#define BLKSZ 1024
+
+struct ModelRes {
+	char *model;
+	int width;
+	int height;
+};
+
+static struct ModelRes modres[] = {
+	{ "S100", 128, 128 },
+	{ "S200", 128, 113 },
+	{ "S300", 128,  97 },
+	{ "S500", 128, 128 },
+	{ "T100", 128, 128 },
+	{ "E700", 128, 128 },
+	{ NULL, 0, 0 }
+};
+
+/*
+ * CRC functions from the Granch SBNI12 Linux driver by
+ * Denis I. Timofeev <timofeev@granch.ru>
+ */
+static unsigned int crc32tab[] = {
+	0xD202EF8D,  0xA505DF1B,  0x3C0C8EA1,  0x4B0BBE37,
+	0xD56F2B94,  0xA2681B02,  0x3B614AB8,  0x4C667A2E,
+	0xDCD967BF,  0xABDE5729,  0x32D70693,  0x45D03605,
+	0xDBB4A3A6,  0xACB39330,  0x35BAC28A,  0x42BDF21C,
+	0xCFB5FFE9,  0xB8B2CF7F,  0x21BB9EC5,  0x56BCAE53,
+	0xC8D83BF0,  0xBFDF0B66,  0x26D65ADC,  0x51D16A4A,
+	0xC16E77DB,  0xB669474D,  0x2F6016F7,  0x58672661,
+	0xC603B3C2,  0xB1048354,  0x280DD2EE,  0x5F0AE278,
+	0xE96CCF45,  0x9E6BFFD3,  0x0762AE69,  0x70659EFF,
+	0xEE010B5C,  0x99063BCA,  0x000F6A70,  0x77085AE6,
+	0xE7B74777,  0x90B077E1,  0x09B9265B,  0x7EBE16CD,
+	0xE0DA836E,  0x97DDB3F8,  0x0ED4E242,  0x79D3D2D4,
+	0xF4DBDF21,  0x83DCEFB7,  0x1AD5BE0D,  0x6DD28E9B,
+	0xF3B61B38,  0x84B12BAE,  0x1DB87A14,  0x6ABF4A82,
+	0xFA005713,  0x8D076785,  0x140E363F,  0x630906A9,
+	0xFD6D930A,  0x8A6AA39C,  0x1363F226,  0x6464C2B0,
+	0xA4DEAE1D,  0xD3D99E8B,  0x4AD0CF31,  0x3DD7FFA7,
+	0xA3B36A04,  0xD4B45A92,  0x4DBD0B28,  0x3ABA3BBE,
+	0xAA05262F,  0xDD0216B9,  0x440B4703,  0x330C7795,
+	0xAD68E236,  0xDA6FD2A0,  0x4366831A,  0x3461B38C,
+	0xB969BE79,  0xCE6E8EEF,  0x5767DF55,  0x2060EFC3,
+	0xBE047A60,  0xC9034AF6,  0x500A1B4C,  0x270D2BDA,
+	0xB7B2364B,  0xC0B506DD,  0x59BC5767,  0x2EBB67F1,
+	0xB0DFF252,  0xC7D8C2C4,  0x5ED1937E,  0x29D6A3E8,
+	0x9FB08ED5,  0xE8B7BE43,  0x71BEEFF9,  0x06B9DF6F,
+	0x98DD4ACC,  0xEFDA7A5A,  0x76D32BE0,  0x01D41B76,
+	0x916B06E7,  0xE66C3671,  0x7F6567CB,  0x0862575D,
+	0x9606C2FE,  0xE101F268,  0x7808A3D2,  0x0F0F9344,
+	0x82079EB1,  0xF500AE27,  0x6C09FF9D,  0x1B0ECF0B,
+	0x856A5AA8,  0xF26D6A3E,  0x6B643B84,  0x1C630B12,
+	0x8CDC1683,  0xFBDB2615,  0x62D277AF,  0x15D54739,
+	0x8BB1D29A,  0xFCB6E20C,  0x65BFB3B6,  0x12B88320,
+	0x3FBA6CAD,  0x48BD5C3B,  0xD1B40D81,  0xA6B33D17,
+	0x38D7A8B4,  0x4FD09822,  0xD6D9C998,  0xA1DEF90E,
+	0x3161E49F,  0x4666D409,  0xDF6F85B3,  0xA868B525,
+	0x360C2086,  0x410B1010,  0xD80241AA,  0xAF05713C,
+	0x220D7CC9,  0x550A4C5F,  0xCC031DE5,  0xBB042D73,
+	0x2560B8D0,  0x52678846,  0xCB6ED9FC,  0xBC69E96A,
+	0x2CD6F4FB,  0x5BD1C46D,  0xC2D895D7,  0xB5DFA541,
+	0x2BBB30E2,  0x5CBC0074,  0xC5B551CE,  0xB2B26158,
+	0x04D44C65,  0x73D37CF3,  0xEADA2D49,  0x9DDD1DDF,
+	0x03B9887C,  0x74BEB8EA,  0xEDB7E950,  0x9AB0D9C6,
+	0x0A0FC457,  0x7D08F4C1,  0xE401A57B,  0x930695ED,
+	0x0D62004E,  0x7A6530D8,  0xE36C6162,  0x946B51F4,
+	0x19635C01,  0x6E646C97,  0xF76D3D2D,  0x806A0DBB,
+	0x1E0E9818,  0x6909A88E,  0xF000F934,  0x8707C9A2,
+	0x17B8D433,  0x60BFE4A5,  0xF9B6B51F,  0x8EB18589,
+	0x10D5102A,  0x67D220BC,  0xFEDB7106,  0x89DC4190,
+	0x49662D3D,  0x3E611DAB,  0xA7684C11,  0xD06F7C87,
+	0x4E0BE924,  0x390CD9B2,  0xA0058808,  0xD702B89E,
+	0x47BDA50F,  0x30BA9599,  0xA9B3C423,  0xDEB4F4B5,
+	0x40D06116,  0x37D75180,  0xAEDE003A,  0xD9D930AC,
+	0x54D13D59,  0x23D60DCF,  0xBADF5C75,  0xCDD86CE3,
+	0x53BCF940,  0x24BBC9D6,  0xBDB2986C,  0xCAB5A8FA,
+	0x5A0AB56B,  0x2D0D85FD,  0xB404D447,  0xC303E4D1,
+	0x5D677172,  0x2A6041E4,  0xB369105E,  0xC46E20C8,
+	0x72080DF5,  0x050F3D63,  0x9C066CD9,  0xEB015C4F,
+	0x7565C9EC,  0x0262F97A,  0x9B6BA8C0,  0xEC6C9856,
+	0x7CD385C7,  0x0BD4B551,  0x92DDE4EB,  0xE5DAD47D,
+	0x7BBE41DE,  0x0CB97148,  0x95B020F2,  0xE2B71064,
+	0x6FBF1D91,  0x18B82D07,  0x81B17CBD,  0xF6B64C2B,
+	0x68D2D988,  0x1FD5E91E,  0x86DCB8A4,  0xF1DB8832,
+	0x616495A3,  0x1663A535,  0x8F6AF48F,  0xF86DC419,
+	0x660951BA,  0x110E612C,  0x88073096,  0xFF000000
+};
+
+static unsigned int GetCRC(char *data, int size)
+{
+	unsigned int crc = 0;
+
+	while (size--)
+		crc = crc32tab[(crc ^ *data++) & 0xff] ^ ((crc >> 8) & 0x00FFFFFF);
+
+	return crc;
+}
+
+/*
+ * Frame transfer
+ */
+
+static GSM_Error WaitFor(GSM_StateMachine *s, char *t, int ttl)
+{
+	char 		readbuf[100];
+	int 		n;
+	unsigned int 	sec;
+        GSM_DateTime    Date;
+
+        GSM_GetCurrentDateTime (&Date);
+        sec = Date.Second;
+
+	n = s->Device.Functions->ReadDevice(s, readbuf, 80);
+	readbuf[n] = 0;
+	while (strstr(readbuf, t) == NULL && (sec + ttl) >= Date.Second) {
+		my_sleep(5000);
+		n = s->Device.Functions->ReadDevice(s, readbuf, 80);
+		readbuf[n] = 0;
+        	GSM_GetCurrentDateTime (&Date);
+	}
+
+	return (sec + ttl) >= Date.Second ? ERR_NONE : ERR_TIMEOUT;
+}
+
+static GSM_Error SetSamsungFrame(GSM_StateMachine *s, unsigned char *buff, int size, GSM_Phone_RequestID id)
+{
+	GSM_Phone_Data		*Phone = &s->Phone.Data;
+	GSM_Error		error;
+	int			i, count;
+
+	count = size / BLKSZ;
+	
+	for (i = 0; i < count; i++) {
+		error = WaitFor(s, ">", 4);
+ 		if (error!=ERR_NONE) return error;
+
+ 		error = s->Protocol.Functions->WriteMessage(s,
+			buff + i * BLKSZ, BLKSZ, 0x00);
+ 		if (error!=ERR_NONE) return error;
+	}
+
+	error = WaitFor(s, ">", 4);
+ 	if (error!=ERR_NONE) return error;
+	error = s->Protocol.Functions->WriteMessage(s,
+		buff + i * BLKSZ, size%BLKSZ, 0x00);
+	if (error!=ERR_NONE) return error;
+
+	error = GSM_WaitFor(s, "", 0, 0x00, 4, id);
+	if (error!=ERR_NONE) return error;
+
+	return Phone->DispatchError;
+}
+
+/* Answer format for binary data transfer
+ *
+ * SDNDCRC = 0xa : RECEIVECRC = 0xcbf53a1c : BINSIZE = 5
+ * CRCERR
+ */
+static GSM_Error ReplySetSamsungFrame(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+	unsigned long 		txcrc, rxcrc;
+	int 			binsize;
+	char 			*pos;
+
+	/* Parse SDNDCRC */
+	pos = strchr(msg.Buffer, '=');
+	if (!pos) return ERR_UNKNOWN;
+	pos++;
+	txcrc = strtoul(pos, NULL, 0);
+	smprintf(s, "Sent CRC     : 0x%lx\n", txcrc);
+
+	/* Parse RECEIVECRC */
+	pos = strchr(pos, '=');
+	if (!pos) return ERR_UNKNOWN;
+	pos++;
+	rxcrc = strtoul(pos, NULL, 0);
+	smprintf(s, "Reveived CRC : 0x%lx\n", rxcrc);
+
+	/* Parse BINSIZE */
+	pos = strchr(pos, '=');
+	if (!pos) return ERR_UNKNOWN;
+	pos++;
+	binsize = strtoul(pos, NULL, 0);
+	smprintf(s, "Binary size  : %d\n", binsize);
+
+	return txcrc == rxcrc ? ERR_NONE : ERR_WRONGCRC;
+}
+  
+/*
+ * Bitmaps
+ */
+
+GSM_Error SAMSUNG_ReplyGetBitmap(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+ 	GSM_Phone_ATGENData 	*Priv = &s->Phone.Data.Priv.ATGEN;
+	unsigned char 		buffer[32];
+	char 			*pos;
+	int			location, count;
+ 
+ 	switch (Priv->ReplyState) {
+ 	case AT_Reply_OK:
+		smprintf(s, "Bitmap info received\n");
+		/* Parse +IMGR:location,name,0,0,0,0 */
+
+		/* Parse location */
+		pos = strchr(msg.Buffer, ':');
+		if (!pos) return ERR_UNKNOWN;
+		pos++;
+		location = atoi(pos);
+		smprintf(s, "Location : %d\n", location);
+
+		/* Parse name */
+		pos = strchr(pos, '"');
+		if (!pos) return ERR_UNKNOWN;
+		pos++;
+		for (count = 0; count < 31; count++) {
+			if (pos[count] == '"')
+				break;
+			buffer[count] = pos[count];
+		}
+		buffer[count] = 0;
+		smprintf(s, "Name     : %s\n", buffer);
+		s->Phone.Data.Bitmap->Name = malloc((strlen(buffer) + 1) * 2);
+		if (s->Phone.Data.Bitmap->Name == NULL)
+			return ERR_MOREMEMORY;
+		EncodeUnicode(s->Phone.Data.Bitmap->Name, buffer, strlen(buffer));
+
+		s->Phone.Data.Bitmap->Location = location;
+
+		return ERR_NONE;
+	case AT_Reply_Error:
+		return ERR_UNKNOWN;
+	case AT_Reply_CMSError:
+	        return ATGEN_HandleCMSError(s);
+	case AT_Reply_CMEError:
+	        return ATGEN_HandleCMEError(s);
+ 	default:
+		return ERR_UNKNOWNRESPONSE;
+	}
+}
+
+GSM_Error SAMSUNG_ReplySetBitmap(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+	smprintf(s, "Bitmap sent\n");
+	return ReplySetSamsungFrame(msg, s); 
+}
+
+GSM_Error SAMSUNG_GetBitmap(GSM_StateMachine *s, GSM_Bitmap *Bitmap)
+{
+	unsigned char req[100];
+
+	s->Phone.Data.Bitmap=Bitmap;
+	smprintf(s, "Getting bitmap\n");
+	sprintf(req, "AT+IMGR=%d\r", Bitmap->Location-1);
+	return GSM_WaitFor (s, req, strlen(req), 0x00, 4, ID_GetBitmap);
+}
+
+GSM_Error SAMSUNG_SetBitmap(GSM_StateMachine *s, GSM_Bitmap *Bitmap)
+{
+	unsigned char	req[100];
+	unsigned long	crc;
+	GSM_Error	error;
+	char		name[50], *dot, *model;
+	GSM_Phone_Data  *Data = &s->Phone.Data;
+	int 		i;
+
+	s->Phone.Data.Bitmap = Bitmap;
+	smprintf(s, "Setting bitmap\n");
+
+	if (Bitmap->Type != GSM_PictureBinary) {
+		smprintf(s, "Invalid picture type\n");
+		return ERR_INVALIDDATA;
+	}
+
+	if (Bitmap->BinaryPic.Type != PICTURE_GIF) {
+		smprintf(s, "Invalid binary picture type\n");
+		return ERR_INVALIDDATA;
+	}
+
+	/* Check if picture size matches phone model */
+	model = GetModelData(NULL,Data->Model,NULL)->model;
+	smprintf(s, "Checking picture size for %s\n", model);
+	for (i = 0; modres[i].model; i++) {
+		if (!strcmp(model, modres[i].model)) {
+			if (Bitmap->BitmapWidth != modres[i].width ||
+			    Bitmap->BitmapHeight != modres[i].height) {
+				smprintf(s, "Model %s must use %d x %d picture size\n",
+					modres[i].model, modres[i].width,
+					modres[i].height);
+				return ERR_INVALIDDATA;
+			}
+			break;
+		}
+	}
+	if (modres[i].model == NULL) {
+		smprintf(s, "Model \"%s\" is not supported.\n", Data->Model);
+		return ERR_NOTSUPPORTED;
+	}
+
+	crc = GetCRC(Bitmap->BinaryPic.Buffer, Bitmap->BinaryPic.Length);
+
+	/* Remove extension from file name */
+	strncpy(name, DecodeUnicodeString(Bitmap->Name), 50);
+	if ((dot = strrchr(name, '.')) != NULL)
+		*dot = 0;
+
+	sprintf(req, "AT+IMGW=0,\"%s\",2,0,0,0,0,100,%d,%u\r", name,
+		Bitmap->BinaryPic.Length, (unsigned int)crc);
+
+	error = s->Protocol.Functions->WriteMessage(s, req, strlen(req), 0x00);
+	if (error!=ERR_NONE) return error;
+
+	return SetSamsungFrame(s, Bitmap->BinaryPic.Buffer,
+		Bitmap->BinaryPic.Length, ID_SetBitmap);
+}
+
+/*
+ * Ringtones
+ */
+
+GSM_Error SAMSUNG_ReplyGetRingtone(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+ 	GSM_Phone_ATGENData 	*Priv = &s->Phone.Data.Priv.ATGEN;
+	unsigned char 		buffer[32];
+	char 			*pos;
+	int			location, length, count;
+ 
+ 	switch (Priv->ReplyState) {
+ 	case AT_Reply_OK:
+		smprintf(s, "Ringtone info received\n");
+		/* Parse +MELR:location,name,size */
+
+		/* Parse location */
+		pos = strchr(msg.Buffer, ':');
+		if (!pos) return ERR_UNKNOWN;
+		pos++;
+		location = atoi(pos);
+		smprintf(s, "Location : %d\n", location);
+
+		/* Parse name */
+		pos = strchr(pos, '"');
+		if (!pos) return ERR_UNKNOWN;
+		pos++;
+		/* Ringtone.Name size is 20 chars */
+		for (count = 0; count < 19; count++) {
+			if (pos[count] == '"')
+				break;
+			buffer[count] = pos[count];
+		}
+		buffer[count] = 0;
+		smprintf(s, "Name     : %s\n", buffer);
+		EncodeUnicode(s->Phone.Data.Ringtone->Name,buffer,strlen(buffer));
+
+		/* Parse ringtone length */
+		pos = strchr(pos, ',');
+		if (!pos) return ERR_UNKNOWN;
+		pos++;
+		length = atoi(pos);
+		smprintf(s, "Length   : %d\n", length);
+
+		/* S300 ringtones are always MMF */
+		s->Phone.Data.Ringtone->Format = RING_MMF;
+		s->Phone.Data.Ringtone->Location = location;
+		s->Phone.Data.Ringtone->BinaryTone.Length = length;
+
+		return ERR_NONE;
+	case AT_Reply_Error:
+		return ERR_UNKNOWN;
+	case AT_Reply_CMSError:
+	        return ATGEN_HandleCMSError(s);
+	case AT_Reply_CMEError:
+	        return ATGEN_HandleCMEError(s);
+ 	default:
+		return ERR_UNKNOWNRESPONSE;
+	}
+}
+
+GSM_Error SAMSUNG_GetRingtone(GSM_StateMachine *s, GSM_Ringtone *Ringtone, bool PhoneRingtone)
+{
+	unsigned char req[100];
+
+	s->Phone.Data.Ringtone = Ringtone;
+	smprintf(s, "Getting ringtone\n");
+	sprintf(req, "AT+MELR=%d\r", Ringtone->Location-1);
+	return GSM_WaitFor (s, req, strlen(req), 0x00, 4, ID_GetRingtone);
+}
+
+GSM_Error SAMSUNG_ReplySetRingtone(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+	smprintf(s, "Ringtone sent\n");
+	return ReplySetSamsungFrame(msg, s); 
+}
+  
+GSM_Error SAMSUNG_SetRingtone(GSM_StateMachine *s, GSM_Ringtone *Ringtone, int *maxlength)
+{
+	unsigned char	req[100];
+	unsigned long	crc;
+	GSM_Error	error;
+	char		name[50], *dot;
+
+	s->Phone.Data.Ringtone = Ringtone;
+	smprintf(s, "Setting ringtone\n");
+
+	if (Ringtone->Format != RING_MMF) {
+		smprintf(s, "Not MMF ringtone\n");
+		return ERR_INVALIDDATA;
+	}
+
+	/* Remove extension from file name */
+	strncpy(name, DecodeUnicodeString(Ringtone->Name), 50);
+	if ((dot = strrchr(name, '.')) != NULL) *dot = 0;
+
+	crc = GetCRC(Ringtone->BinaryTone.Buffer, Ringtone->BinaryTone.Length);
+	sprintf(req, "AT+MELW=0,\"%s\",4,%d,%u\r", name,
+		Ringtone->BinaryTone.Length, (unsigned int)crc);
+
+	error = s->Protocol.Functions->WriteMessage(s, req, strlen(req), 0x00);
+	if (error!=ERR_NONE) return error;
+
+	return SetSamsungFrame(s, Ringtone->BinaryTone.Buffer,
+		Ringtone->BinaryTone.Length, ID_SetRingtone);
+}
+
+#endif
diff --git a/gammu/emb/common/phone/at/samsung.h b/gammu/emb/common/phone/at/samsung.h
new file mode 100644
index 0000000..3b2947c
--- a/dev/null
+++ b/gammu/emb/common/phone/at/samsung.h
@@ -0,0 +1,16 @@
+#ifndef samsung_h
+#define samsung_h
+
+#include "../../gsmstate.h"
+
+GSM_Error SAMSUNG_ReplyGetRingtone	(GSM_Protocol_Message, GSM_StateMachine *);
+GSM_Error SAMSUNG_ReplySetRingtone	(GSM_Protocol_Message, GSM_StateMachine *);
+GSM_Error SAMSUNG_ReplyGetBitmap	(GSM_Protocol_Message, GSM_StateMachine *);
+GSM_Error SAMSUNG_ReplySetBitmap	(GSM_Protocol_Message, GSM_StateMachine *);
+GSM_Error SAMSUNG_GetRingtone		(GSM_StateMachine *, GSM_Ringtone *, bool);
+GSM_Error SAMSUNG_SetRingtone		(GSM_StateMachine *, GSM_Ringtone *, int *);
+GSM_Error SAMSUNG_GetBitmap		(GSM_StateMachine *, GSM_Bitmap *);
+GSM_Error SAMSUNG_SetBitmap		(GSM_StateMachine *, GSM_Bitmap *);
+GSM_Error SAMSUNG_GetCallLogs		(GSM_StateMachine *, GSM_MemoryEntry *, int);
+
+#endif
diff --git a/gammu/emb/common/phone/at/siemens.c b/gammu/emb/common/phone/at/siemens.c
index ab7dd2c..7f66cf8 100644
--- a/gammu/emb/common/phone/at/siemens.c
+++ b/gammu/emb/common/phone/at/siemens.c
@@ -4,43 +4,29 @@
 
 #ifdef GSM_ENABLE_ATGEN
 
 #include <string.h>
 #include <time.h>
 #include <ctype.h>
 
 #include "../../misc/coding/coding.h"
 #include "../../gsmcomon.h"
 #include "../../service/sms/gsmsms.h"
 #include "../pfunc.h"
 
-extern GSM_Error ATGEN_HandleCMSError(GSM_StateMachine *s);
+#include "atgen.h"
+#include "siemens.h"
 
-GSM_Error ATGEN_CMS35ReplySetFunction (GSM_Protocol_Message msg, GSM_StateMachine *s,char *function)
-{
-	if (s->Protocol.Data.AT.EditMode) {
-	    s->Protocol.Data.AT.EditMode = false;
-	    return ERR_NONE;
-	}
-	dbgprintf ("Written %s",function);
-  	if (s->Phone.Data.Priv.ATGEN.ReplyState == AT_Reply_OK){
-  		dbgprintf (" - OK\n");
-  		return ERR_NONE;
-	} else {
-  		dbgprintf (" - error\n");
-  		return ERR_UNKNOWN;
-	}
-}
 
-GSM_Error GetSiemensFrame(GSM_Protocol_Message msg, GSM_StateMachine *s, char *templ,
+static GSM_Error GetSiemensFrame(GSM_Protocol_Message msg, GSM_StateMachine *s, char *templ,
 			    unsigned char *buffer, int *len)
 {
 	GSM_Phone_ATGENData 	*Priv = &s->Phone.Data.Priv.ATGEN;
 	int			i=2, pos=0, length=0;
 	unsigned char 		buf[512];
 
 	if (strstr(GetLineString(msg.Buffer,Priv->Lines,2),"OK")) return ERR_EMPTY;
         if (!strstr(GetLineString(msg.Buffer,Priv->Lines,2),templ)) return ERR_UNKNOWN;
 
 	while (1) {
 		if (Priv->Lines.numbers[i*2+1]==0) break;
 		if ((!strstr(GetLineString(msg.Buffer,Priv->Lines,i+1),templ)) && 
@@ -48,25 +34,25 @@ GSM_Error GetSiemensFrame(GSM_Protocol_Message msg, GSM_StateMachine *s, char *t
 			length = strlen(GetLineString(msg.Buffer,Priv->Lines,i+1));
 			DecodeHexBin(buf, GetLineString(msg.Buffer,Priv->Lines,i+1),length);
 			length = length/2;
 			memcpy (buffer+pos,buf,length);
 			pos+=length;
 		} 
 		i++;
 	}
 	*len = pos;
        return ERR_NONE;	
 }
 
-GSM_Error SetSiemensFrame (GSM_StateMachine *s, unsigned char *buff, char *templ,
+static GSM_Error SetSiemensFrame (GSM_StateMachine *s, unsigned char *buff, char *templ,
 			    int Location, GSM_Phone_RequestID RequestID, int len)
 {
 	GSM_Phone_Data		*Phone = &s->Phone.Data;
 	GSM_Error		error;
 	unsigned char 		req[20],req1[512],hexreq[2096];
 	int			MaxFrame,CurrentFrame,size,sz,pos=0;
 
 	EncodeHexBin(hexreq,buff,len);
 	size	 = len * 2;
 	MaxFrame = size / 352;
 	if (size % 352) MaxFrame++;
 
@@ -81,125 +67,135 @@ GSM_Error SetSiemensFrame (GSM_StateMachine *s, unsigned char *buff, char *templ
 	     	if (error!=ERR_NONE) return error;
 	 	memcpy (req1,hexreq+pos,sz);
 	 	error = s->Protocol.Functions->WriteMessage(s, req1, sz, 0x00);
 	 	if (error!=ERR_NONE) return error;
 		error = s->Protocol.Functions->WriteMessage(s,"\x1A", 1, 0x00);
 	 	if (error!=ERR_NONE) return error;
 		error = GSM_WaitForOnce(s, NULL, 0x00, 0x00, 4);
 	 	if (error == ERR_TIMEOUT) return error;
 	 }
 	 return Phone->DispatchError;
 }
 
-GSM_Error ATGEN_CMS35ReplyGetBitmap(GSM_Protocol_Message msg, GSM_StateMachine *s)
+GSM_Error SIEMENS_ReplyGetBitmap(GSM_Protocol_Message msg, GSM_StateMachine *s)
 {
 	unsigned char 		buffer[4096];
 	int			length;
 	GSM_Error		error;
 	
 	error = GetSiemensFrame(msg,s,"bmp",buffer,&length);
 	if (error!=ERR_NONE) return error;
 	dbgprintf ("Operator logo received lenght=%i\n",length);
 	error = BMP2Bitmap (buffer,NULL,s->Phone.Data.Bitmap);
 	if (error==ERR_NONE) return error;
 	else return ERR_UNKNOWN;
 }
 
-GSM_Error ATGEN_CMS35ReplySetBitmap(GSM_Protocol_Message msg, GSM_StateMachine *s)
+GSM_Error SIEMENS_ReplySetFunction (GSM_Protocol_Message msg, GSM_StateMachine *s,char *function)
 {
-    return ATGEN_CMS35ReplySetFunction (msg, s, "Operator Logo");
	
+	if (s->Protocol.Data.AT.EditMode) {
+	    s->Protocol.Data.AT.EditMode = false;
+	    return ERR_NONE;
+	}
+	dbgprintf ("Written %s",function);
+  	if (s->Phone.Data.Priv.ATGEN.ReplyState == AT_Reply_OK){
+  		dbgprintf (" - OK\n");
+  		return ERR_NONE;
+	} else {
+  		dbgprintf (" - error\n");
+  		return ERR_UNKNOWN;
+	}
 }
 
-GSM_Error ATGEN_GetBitmap(GSM_StateMachine *s, GSM_Bitmap *Bitmap)
+GSM_Error SIEMENS_ReplySetBitmap(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+    return SIEMENS_ReplySetFunction (msg, s, "Operator Logo");
	
+}
+
+GSM_Error SIEMENS_GetBitmap(GSM_StateMachine *s, GSM_Bitmap *Bitmap)
 {
 	unsigned char req[32];
 
-	if (s->Phone.Data.Priv.ATGEN.Manufacturer!=AT_Siemens) return ERR_NOTSUPPORTED;
 	if (Bitmap->Type!=GSM_OperatorLogo) return ERR_NOTSUPPORTED;
 	if (Bitmap->Location-1 < 0) Bitmap->Location++;
 	s->Phone.Data.Bitmap=Bitmap;
 	sprintf(req, "AT^SBNR=\"bmp\",%i\r", Bitmap->Location-1);
 	smprintf(s, "Getting Bitmap\n");
 	return GSM_WaitFor (s, req, strlen(req), 0x00, 4, ID_GetBitmap);
 }
 
-GSM_Error ATGEN_SetBitmap(GSM_StateMachine *s, GSM_Bitmap *Bitmap)
+GSM_Error SIEMENS_SetBitmap(GSM_StateMachine *s, GSM_Bitmap *Bitmap)
 {
 	unsigned char 	buffer[4096];
 	int 		length;
 	GSM_Error	error;
 	
-	if (s->Phone.Data.Priv.ATGEN.Manufacturer!=AT_Siemens) return ERR_NOTSUPPORTED;
 	if (Bitmap->Type!=GSM_OperatorLogo) return ERR_NOTSUPPORTED;
 
 	error = Bitmap2BMP (buffer,NULL,Bitmap);
 	if (error!=ERR_NONE) return error;
 	length = 0x100 * buffer[3] + buffer[2];
 	buffer[58]=0xff; buffer[59]=0xff; buffer[60]=0xff;
 	if (Bitmap->Location-1 < 0) Bitmap->Location++;
 	s->Phone.Data.Bitmap=Bitmap;
 	return SetSiemensFrame(s, buffer,"bmp",Bitmap->Location-1,
 				ID_SetBitmap,length);
 }
 
-GSM_Error ATGEN_CMS35ReplyGetRingtone(GSM_Protocol_Message msg, GSM_StateMachine *s)
+GSM_Error SIEMENS_ReplyGetRingtone(GSM_Protocol_Message msg, GSM_StateMachine *s)
 {
 	unsigned char 		buffer[32];
 	int			length;
 	GSM_Error		error;
 
         error = GetSiemensFrame(msg,s,"mid",s->Phone.Data.Ringtone->NokiaBinary.Frame,&length);
 	if (error!=ERR_NONE) return error;
 	dbgprintf ("Midi ringtone received\n");
 	
 	s->Phone.Data.Ringtone->Format			= RING_MIDI;
 	s->Phone.Data.Ringtone->NokiaBinary.Length	= length;
 	sprintf(buffer,"Individual");
 	EncodeUnicode (s->Phone.Data.Ringtone->Name,buffer,strlen(buffer));
 	return ERR_NONE;
 }
 
-GSM_Error ATGEN_GetRingtone(GSM_StateMachine *s, GSM_Ringtone *Ringtone, bool PhoneRingtone)
+GSM_Error SIEMENS_GetRingtone(GSM_StateMachine *s, GSM_Ringtone *Ringtone, bool PhoneRingtone)
 {
 	unsigned char req[32];
 
-	if (s->Phone.Data.Priv.ATGEN.Manufacturer!=AT_Siemens) return ERR_NOTSUPPORTED;
-	
 	s->Phone.Data.Ringtone=Ringtone;
 	sprintf(req, "AT^SBNR=\"mid\",%i\r", Ringtone->Location-1);
 	smprintf(s, "Getting RingTone\n");
 	return GSM_WaitFor (s, req, strlen(req), 0x00, 4, ID_GetRingtone);
 }
 
-GSM_Error ATGEN_CMS35ReplySetRingtone(GSM_Protocol_Message msg, GSM_StateMachine *s)
+GSM_Error SIEMENS_ReplySetRingtone(GSM_Protocol_Message msg, GSM_StateMachine *s)
 {
-	return ATGEN_CMS35ReplySetFunction (msg, s, "Ringtone");
+	return SIEMENS_ReplySetFunction (msg, s, "Ringtone");
 }
   
-GSM_Error ATGEN_SetRingtone(GSM_StateMachine *s, GSM_Ringtone *Ringtone, int *maxlength)
+GSM_Error SIEMENS_SetRingtone(GSM_StateMachine *s, GSM_Ringtone *Ringtone, int *maxlength)
 {
 	GSM_Phone_Data *Phone = &s->Phone.Data;
 	 
-	if (s->Phone.Data.Priv.ATGEN.Manufacturer!=AT_Siemens) return ERR_NOTSUPPORTED;
-
 	if (Ringtone->Location==255) Ringtone->Location=1; 
 	if (Ringtone->Location-1 > 1) return ERR_INVALIDLOCATION;
 
 	s->Phone.Data.Ringtone	= Ringtone;
  	Phone->Ringtone		= Ringtone;
 	return SetSiemensFrame(s, Ringtone->NokiaBinary.Frame,"mid",Ringtone->Location-1,
 				ID_SetRingtone,Ringtone->NokiaBinary.Length);
 }
 
-GSM_Error ATGEN_CMS35ReplyGetNextCal(GSM_Protocol_Message msg, GSM_StateMachine *s)
+GSM_Error SIEMENS_ReplyGetNextCalendar(GSM_Protocol_Message msg, GSM_StateMachine *s)
 {
 	GSM_Phone_Data		*Data = &s->Phone.Data;
 	GSM_CalendarEntry	*Calendar = Data->Cal;
 	GSM_ToDoEntry		ToDo;
 	GSM_Error		error;
 	unsigned char 		buffer[354];
 	int			len, pos=0;
 
 	if (Data->Priv.ATGEN.ReplyState != AT_Reply_OK) return ERR_UNKNOWN;
 
 	error = GetSiemensFrame(msg,s,"vcs",buffer,&len);
 	if (error!=ERR_NONE) return error;
@@ -226,30 +222,30 @@ GSM_Error SIEMENS_GetNextCalendar(GSM_StateMachine *s, GSM_CalendarEntry *Note,
 		Location++;
 		sprintf(req, "AT^SBNR=\"vcs\",%i\r",Location);  
 		error = GSM_WaitFor (s, req, strlen(req), 0x00, 4, ID_GetCalendarNote);
 		if ((error!=ERR_NONE) && (error!=ERR_EMPTY)) return ERR_INVALIDLOCATION;
 		Note->Location 		= Location;
 		Priv->FirstCalendarPos 	= Location;
 		if (Location > MAX_VCALENDAR_LOCATION) return ERR_EMPTY;
 		if (error==ERR_NONE) return error;
 	}
 	return error;
 }
 
-GSM_Error ATGEN_CMS35ReplySetCalendar(GSM_Protocol_Message msg, GSM_StateMachine *s)
+GSM_Error SIEMENS_ReplyAddCalendarNote(GSM_Protocol_Message msg, GSM_StateMachine *s)
 {
-    return ATGEN_CMS35ReplySetFunction (msg, s, "Calendar Note");
+    return SIEMENS_ReplySetFunction (msg, s, "Calendar Note");
 }
 
-GSM_Error ATGEN_CMS35ReplyDeleteCalendar(GSM_Protocol_Message msg, GSM_StateMachine *s)
+GSM_Error SIEMENS_ReplyDelCalendarNote(GSM_Protocol_Message msg, GSM_StateMachine *s)
 {
 	GSM_Phone_Data *Data = &s->Phone.Data;
 	
 	if (Data->Cal->Location > MAX_VCALENDAR_LOCATION) return ERR_UNKNOWN;
 	
 	if (Data->Priv.ATGEN.ReplyState== AT_Reply_OK) {
 		smprintf(s, "Calendar note deleted\n");
 		return ERR_NONE;
 	} else {
 		smprintf(s, "Can't delete calendar note\n");
 		return ERR_UNKNOWN;
 	}
@@ -274,25 +270,25 @@ GSM_Error SIEMENS_AddCalendarNote(GSM_StateMachine *s, GSM_CalendarEntry *Note)
 	int			size=0;
 
 	if (Priv->Manufacturer!=AT_Siemens) return ERR_NOTSUPPORTED;
 //	if (Note->Location==0x00) return ERR_INVALIDLOCATION;	
 
 	s->Phone.Data.Cal = Note;
 	error=GSM_EncodeVCALENDAR(req,&size,Note,true,Siemens_VCalendar);
 		
 	return SetSiemensFrame (s,req,"vcs",Note->Location,ID_SetCalendarNote,size);
 }
 
 /* (c) by Timo Teras */
-GSM_Error ATGEN_SL45ReplyGetMemory(GSM_Protocol_Message msg, GSM_StateMachine *s)
+GSM_Error SIEMENS_ReplyGetMemory(GSM_Protocol_Message msg, GSM_StateMachine *s)
 {
 #ifndef ENABLE_LGPL
  	GSM_Phone_ATGENData 	*Priv = &s->Phone.Data.Priv.ATGEN;
  	GSM_MemoryEntry		*Memory = s->Phone.Data.Memory;
 	unsigned char		buffer[500],buffer2[500];
 
 	switch (Priv->ReplyState) {
 	case AT_Reply_OK:
  		smprintf(s, "Phonebook entry received\n");
 		CopyLineString(buffer, msg.Buffer, Priv->Lines, 3);
 		DecodeHexBin(buffer2,buffer,strlen(buffer));
  		Memory->EntriesNum = 0;
diff --git a/gammu/emb/common/phone/at/sonyeric.c b/gammu/emb/common/phone/at/sonyeric.c
index 4b2670a..8eeb39b 100644
--- a/gammu/emb/common/phone/at/sonyeric.c
+++ b/gammu/emb/common/phone/at/sonyeric.c
@@ -2,35 +2,33 @@
                                            
 #include "../../gsmstate.h"
 
 #ifdef GSM_ENABLE_ATGEN
 
 #include <string.h>
 #include <time.h>
 #include <ctype.h>
 
 #include "../../gsmcomon.h"
 #include "../../misc/coding/coding.h"
 
-extern GSM_Reply_Function 		ATGENReplyFunctions[];
-extern GSM_Error ATGEN_DispatchMessage	(GSM_StateMachine *s);
+#include "atgen.h"
+#include "sonyeric.h"
 
 #ifdef GSM_ENABLE_OBEXGEN
 
-extern GSM_Reply_Function 		OBEXGENReplyFunctions[];
-extern GSM_Error OBEXGEN_GetFilePart	(GSM_StateMachine *s, GSM_File *File);
-extern GSM_Error OBEXGEN_AddFilePart	(GSM_StateMachine *s, GSM_File *File, int *Pos);
-extern GSM_Error OBEXGEN_Disconnect	(GSM_StateMachine *s);
+#include "../obex/obexgen.h"
 
-#if defined(GSM_ENABLE_BLUEOBEX) || defined(GSM_ENABLE_IRDAOBEX)
+extern GSM_Reply_Function	OBEXGENReplyFunctions[];
+extern GSM_Reply_Function	ATGENReplyFunctions[];
 
 static GSM_Error SONYERIC_SetOBEXMode(GSM_StateMachine *s)
 {
 	GSM_Phone_ATGENData	*Priv = &s->Phone.Data.Priv.ATGEN;
 	GSM_Error		error;
 
 	if (Priv->OBEX) return ERR_NONE;
 
 	dbgprintf ("Changing to OBEX\n");
 
 	error=GSM_WaitFor (s, "AT*EOBEX\r", 9, 0x00, 4, ID_SetOBEX);
 	if (error != ERR_NONE) return error;
@@ -117,25 +115,25 @@ static GSM_Error SONYERIC_SetFile(GSM_StateMachine *s, unsigned char *FileName,
 	error = ERR_NONE;
 	while (error == ERR_NONE) error = OBEXGEN_AddFilePart(s,&File,&Pos);
 	free(File.Buffer);
 	if (error != ERR_EMPTY) return error;
 
 	return SONYERIC_SetATMode(s);
 }
 
 #endif
 
 GSM_Error SONYERIC_GetNextCalendar(GSM_StateMachine *s, GSM_CalendarEntry *Note, bool start)
 {
-#if defined(GSM_ENABLE_BLUEOBEX) || defined(GSM_ENABLE_IRDAOBEX)
+#ifdef GSM_ENABLE_OBEXGEN
 	GSM_Error		error;
 	GSM_ToDoEntry		ToDo;
 	int			Pos, num, Loc;
 	GSM_Phone_ATGENData	*Priv = &s->Phone.Data.Priv.ATGEN;
 
 	if (start) {
 		error = SONYERIC_GetFile(s, &Priv->file, "telecom/cal.vcs");
 		if (error != ERR_NONE) return error;
 
 		Note->Location = 1;
 	} else {
 		Note->Location++;
@@ -153,25 +151,25 @@ GSM_Error SONYERIC_GetNextCalendar(GSM_StateMachine *s, GSM_CalendarEntry *Note,
 			num++;
 			if (num == Loc) return ERR_NONE;
 		}
 	}
 	return ERR_EMPTY;
 #else
 	return ERR_SOURCENOTAVAILABLE;
 #endif
 }
 
 GSM_Error SONYERIC_GetNextToDo(GSM_StateMachine *s, GSM_ToDoEntry *ToDo, bool start)
 {
-#if defined(GSM_ENABLE_BLUEOBEX) || defined(GSM_ENABLE_IRDAOBEX)
+#ifdef GSM_ENABLE_OBEXGEN
 	GSM_Error		error;
 	GSM_CalendarEntry	Calendar;
 	int			Pos, num, Loc;
 	GSM_Phone_ATGENData	*Priv = &s->Phone.Data.Priv.ATGEN;
 
 	if (Priv->Manufacturer!=AT_Ericsson) return ERR_NOTSUPPORTED;
 
 	if (start) {
 		error = SONYERIC_GetFile(s, &Priv->file, "telecom/cal.vcs");
 		if (error != ERR_NONE) return error;
 
 		ToDo->Location = 1;
@@ -192,25 +190,25 @@ GSM_Error SONYERIC_GetNextToDo(GSM_StateMachine *s, GSM_ToDoEntry *ToDo, bool st
 			if (num == Loc) return ERR_NONE;
 		}
 	}
 
 	return ERR_EMPTY;
 #else
 	return ERR_SOURCENOTAVAILABLE;
 #endif
 }
 
 GSM_Error SONYERIC_GetToDoStatus(GSM_StateMachine *s, GSM_ToDoStatus *status)
 {
-#if defined(GSM_ENABLE_BLUEOBEX) || defined(GSM_ENABLE_IRDAOBEX)
+#ifdef GSM_ENABLE_OBEXGEN
 	GSM_Error		error;
 	GSM_ToDoEntry		ToDo;
 	GSM_CalendarEntry 	Calendar;
 	int			Pos;
 	GSM_Phone_ATGENData	*Priv = &s->Phone.Data.Priv.ATGEN;
 
 	if (Priv->Manufacturer!=AT_Ericsson) return ERR_NOTSUPPORTED;
 
 	smprintf(s,"Getting ToDo status\n");
 
 	error = SONYERIC_GetFile(s, &Priv->file, "telecom/cal.vcs");
 	if (error != ERR_NONE) return error;
@@ -223,60 +221,60 @@ GSM_Error SONYERIC_GetToDoStatus(GSM_StateMachine *s, GSM_ToDoStatus *status)
 		if (error != ERR_NONE) return error;
 		if (ToDo.EntriesNum != 0) status->Used++;
 	}
 	
 	return ERR_NONE;
 #else
 	return ERR_SOURCENOTAVAILABLE;
 #endif
 }
 
 GSM_Error SONYERIC_AddCalendarNote(GSM_StateMachine *s, GSM_CalendarEntry *Note)
 {
-#if defined(GSM_ENABLE_BLUEOBEX) || defined(GSM_ENABLE_IRDAOBEX)
+#ifdef GSM_ENABLE_OBEXGEN
 	unsigned char 		req[5000];
 	int			size=0;
 
 	smprintf(s,"Adding calendar note\n");
 
 	GSM_EncodeVCALENDAR(req,&size,Note,true,SonyEricsson_VCalendar);
 
 	return SONYERIC_SetFile(s, "telecom/cal/luid/.vcs", req, size);
 #else
 	return ERR_SOURCENOTAVAILABLE;
 #endif
 }
 
 GSM_Error SONYERIC_AddToDo(GSM_StateMachine *s, GSM_ToDoEntry *ToDo)
 {
-#if defined(GSM_ENABLE_BLUEOBEX) || defined(GSM_ENABLE_IRDAOBEX)
+#ifdef GSM_ENABLE_OBEXGEN
 	GSM_Phone_ATGENData	*Priv = &s->Phone.Data.Priv.ATGEN;
 	unsigned char 		req[5000];
 	int			size=0;
 
 	if (Priv->Manufacturer!=AT_Ericsson) return ERR_NOTSUPPORTED;
 
 	smprintf(s,"Adding ToDo\n");
 
 	GSM_EncodeVTODO(req,&size,ToDo,true,SonyEricsson_VToDo);
 
 	return SONYERIC_SetFile(s, "telecom/cal/luid/.vcs", req, size);
 #else
 	return ERR_SOURCENOTAVAILABLE;
 #endif
 }
 
 GSM_Error SONYERIC_DeleteAllToDo(GSM_StateMachine *s)
 {
-#if defined(GSM_ENABLE_BLUEOBEX) || defined(GSM_ENABLE_IRDAOBEX)
+#ifdef GSM_ENABLE_OBEXGEN
 	GSM_Error		error;
 	int			Pos,Level = 0,Used;
 	unsigned char		*Buf;
 	GSM_Phone_ATGENData	*Priv = &s->Phone.Data.Priv.ATGEN;
 	unsigned char 		Line[2000];
 
 	if (Priv->Manufacturer!=AT_Ericsson) return ERR_NOTSUPPORTED;
 
 	smprintf(s,"Deleting all ToDo\n");
 
 	error = SONYERIC_GetFile(s, &Priv->file, "telecom/cal.vcs");
 	if (error != ERR_NONE) return error;
@@ -310,25 +308,25 @@ GSM_Error SONYERIC_DeleteAllToDo(GSM_StateMachine *s)
 	}
 
 	error = SONYERIC_SetFile(s, "telecom/cal.vcs", Buf, Used);
 //	if (Buf != NULL) free(Buf);
 	return error;
 #else
 	return ERR_SOURCENOTAVAILABLE;
 #endif
 }
 
 GSM_Error SONYERIC_DelCalendarNote(GSM_StateMachine *s, GSM_CalendarEntry *Note)
 {
-#if defined(GSM_ENABLE_BLUEOBEX) || defined(GSM_ENABLE_IRDAOBEX)
+#ifdef GSM_ENABLE_OBEXGEN
 	GSM_Error		error;
 	int			Pos,Level = 0,Loc=0,Used;
 	GSM_Phone_ATGENData	*Priv = &s->Phone.Data.Priv.ATGEN;
 	unsigned char 		Line[2000];
 	unsigned char		*Buf;
 
 	smprintf(s, "Deleting calendar note %i\n",Note->Location);
 
 	error = SONYERIC_GetFile(s, &Priv->file, "telecom/cal.vcs");
 	if (error != ERR_NONE) return error;
 
 	Pos  = 0;
@@ -365,25 +363,25 @@ GSM_Error SONYERIC_DelCalendarNote(GSM_StateMachine *s, GSM_CalendarEntry *Note)
 	DumpMessage(s->di.df, s->di.dl, Buf, Used);
 
 	error = SONYERIC_SetFile(s, "telecom/cal.vcs", Buf, Used);
 	if (Buf != NULL) free(Buf);
 	return error;
 #else
 	return ERR_SOURCENOTAVAILABLE;
 #endif
 }
 
 GSM_Error SONYERIC_GetCalendarStatus(GSM_StateMachine *s, GSM_CalendarStatus *Status)
 {
-#if defined(GSM_ENABLE_BLUEOBEX) || defined(GSM_ENABLE_IRDAOBEX)
+#ifdef GSM_ENABLE_OBEXGEN
 	GSM_Error		error;
 	GSM_ToDoEntry		ToDo;
 	GSM_CalendarEntry 	Calendar;
 	int			Pos;
 	GSM_Phone_ATGENData	*Priv = &s->Phone.Data.Priv.ATGEN;
 
 	if (Priv->Manufacturer!=AT_Ericsson) return ERR_NOTSUPPORTED;
 
 	smprintf(s, "Getting calendar status\n");
 
 	error = SONYERIC_GetFile(s, &Priv->file, "telecom/cal.vcs");
 	if (error != ERR_NONE) return error;
@@ -394,18 +392,129 @@ GSM_Error SONYERIC_GetCalendarStatus(GSM_StateMachine *s, GSM_CalendarStatus *St
 		error = GSM_DecodeVCALENDAR_VTODO(Priv->file.Buffer, &Pos, &Calendar, &ToDo, SonyEricsson_VCalendar, SonyEricsson_VToDo);
 		if (error == ERR_EMPTY) break;
 		if (error != ERR_NONE) return error;
 		if (Calendar.EntriesNum != 0) Status->Used++;
 	}
 	
 	return ERR_NONE;
 #else
 	return ERR_SOURCENOTAVAILABLE;
 #endif
 }
 
-#endif
+GSM_Error ERICSSON_ReplyGetDateLocale(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{ /*	Author: Peter Ondraska, based on code by Marcin Wiacek and Michal Cihar
+	License: Whatever the current maintainer of gammulib chooses, as long as there
+	is an easy way to obtain the source under GPL, otherwise the author's parts
+	of this function are GPL 2.0.
+  */
+	GSM_Locale	*locale = s->Phone.Data.Locale;
+	char		format;
+
+	switch (s->Phone.Data.Priv.ATGEN.ReplyState) {
+	case AT_Reply_OK:
+		smprintf(s, "Date settings received\n");
+		format=atoi(msg.Buffer);
+		switch (format) {
+			case 0: locale->DateFormat 	= GSM_Date_OFF;
+				locale->DateSeparator 	= 0;
+				break;
+			case 1: locale->DateFormat 	= GSM_Date_DDMMMYY;
+				locale->DateSeparator 	= '-';
+				break;
+			case 2: locale->DateFormat 	= GSM_Date_DDMMYY;
+				locale->DateSeparator 	= '-';
+				break;
+			case 3: locale->DateFormat 	= GSM_Date_MMDDYY;
+				locale->DateSeparator 	= '/';
+				break;
+			case 4: locale->DateFormat 	= GSM_Date_DDMMYY;
+				locale->DateSeparator 	= '/';
+				break;
+			case 5: locale->DateFormat 	= GSM_Date_DDMMYY;
+				locale->DateSeparator 	= '.';
+				break;
+			case 6: locale->DateFormat 	= GSM_Date_YYMMDD;
+				locale->DateSeparator 	= 0;
+				break;
+			case 7: locale->DateFormat 	= GSM_Date_YYMMDD;
+				locale->DateSeparator 	= '-';
+				break;
+			default:return ERR_UNKNOWNRESPONSE;
+		}
+	default: 
+		return ERR_NOTSUPPORTED;
+	}
+}
+
+GSM_Error ERICSSON_ReplyGetTimeLocale(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{ /*	Author: Peter Ondraska
+	License: Whatever the current maintainer of gammulib chooses, as long as there
+	is an easy way to obtain the source under GPL, otherwise the author's parts
+	of this function are GPL 2.0.
+  */
+	char format;
+
+	switch (s->Phone.Data.Priv.ATGEN.ReplyState) {
+	case AT_Reply_OK:
+		smprintf(s, "Time settings received\n");
+		format=atoi(msg.Buffer);
+		switch (format) {
+		case 1:
+		case 2: s->Phone.Data.Locale->AMPMTime=(format==2);
+			return ERR_NONE;
+		default:return ERR_UNKNOWNRESPONSE;
+		}
+	default: return ERR_NOTSUPPORTED;
+	}
+}
+
+GSM_Error ERICSSON_GetLocale(GSM_StateMachine *s, GSM_Locale *locale)
+{
+        GSM_Error error;
+
+	s->Phone.Data.Locale = locale;
+
+	smprintf(s, "Getting date format\n");
+	error=GSM_WaitFor (s, "AT+ESDF?\r", 9, 0x00, 3, ID_GetLocale);
+	if (error!=ERR_NONE) return error;
+
+	smprintf(s, "Getting time format\n");
+	return GSM_WaitFor (s, "AT+ESTF?\r", 9, 0x00, 3, ID_GetLocale);
+}
+
+
+GSM_Error ERICSSON_SetLocale(GSM_StateMachine *s, GSM_Locale *locale)
+{ /*	Author: Peter Ondraska
+	License: Whatever the current maintainer of gammulib chooses, as long as there
+	is an easy way to obtain the source under GPL, otherwise the author's parts
+	of this function are GPL 2.0.
+  */
+	/* this is not yet supported by gammu.c */
+	int	format=0;
+	char	req[12];
+
+	if (locale->DateFormat==GSM_Date_OFF) { format=0; } else
+	if ((locale->DateFormat==GSM_Date_DDMMMYY)&&(locale->DateSeparator=='-')) { format=1; } else
+	if ((locale->DateFormat==GSM_Date_DDMMYY)&&(locale->DateSeparator=='-')) { format=2; } else
+	if ((locale->DateFormat==GSM_Date_MMDDYY)&&(locale->DateSeparator=='/')) { format=3; } else
+	if ((locale->DateFormat==GSM_Date_DDMMYY)&&(locale->DateSeparator=='/')) { format=4; } else
+	if ((locale->DateFormat==GSM_Date_DDMMYY)&&(locale->DateSeparator=='.')) { format=5; } else
+	if ((locale->DateFormat==GSM_Date_YYMMDD)&&(locale->DateSeparator==0)) { format=6; } else
+	if ((locale->DateFormat==GSM_Date_YYMMDD)&&(locale->DateSeparator=='-')) { format=7; }
+	else { return ERR_NOTSUPPORTED; } /* ERR_WRONGINPUT */
+
+	sprintf(req,"AT+ESDF=%i\r",format);
+	smprintf(s, "Setting date format\n");
+	return GSM_WaitFor (s, req, strlen(req), 0x00, 3, ID_SetLocale);
+
+	if (locale->AMPMTime) { format=2; } else { format=1; }
+	sprintf(req,"AT+ESTF=%i\r",format);
+	smprintf(s, "Setting time format\n");
+	return GSM_WaitFor (s, req, strlen(req), 0x00, 3, ID_SetLocale);
+}
+
 #endif
 
 /* How should editor hadle tabs in this file? Add editor commands here.
  * vim: noexpandtab sw=8 ts=8 sts=8:
  */
diff --git a/gammu/emb/common/phone/nokia/dct3/dct3func.c b/gammu/emb/common/phone/nokia/dct3/dct3func.c
index beef33c..17cd0a4 100644
--- a/gammu/emb/common/phone/nokia/dct3/dct3func.c
+++ b/gammu/emb/common/phone/nokia/dct3/dct3func.c
@@ -1,15 +1,18 @@
 /* (c) 2001-2004 by Marcin Wiacek */
-/* based on some work from Markus Plail, Pavel Janik, others and Gnokii */
 /* resetting DCT4 phones settings (c) by Walek */
+/* based on some Markus Plail, Pavel Janik & others work from Gnokii (www.gnokii.org)
+ * (C) 1999-2000 Hugh Blemings & Pavel Janik ml. (C) 2001-2004 Pawel Kot 
+ * GNU GPL version 2 or later
+ */
 
 #include <string.h> /* memcpy only */
 #include <stdio.h>
 #include <ctype.h>
 
 #include "../../../gsmstate.h"
 #include "../../../misc/coding/coding.h"
 #include "../../../service/sms/gsmsms.h"
 #include "../../pfunc.h"
 #include "../nfunc.h"
 #include "dct3func.h"
 
@@ -385,24 +388,25 @@ GSM_Error DCT3_ReplyGetSMSC(GSM_Protocol_Message msg, GSM_StateMachine *s)
 	switch (msg.Buffer[3]) {
 	case 0x34:
 		smprintf(s, "SMSC received\n");
 		Data->SMSC->Format = SMS_FORMAT_Text;
 		switch (msg.Buffer[6]) {
 			case 0x00: Data->SMSC->Format = SMS_FORMAT_Text; 	break;
 			case 0x22: Data->SMSC->Format = SMS_FORMAT_Fax; 	break;
 			case 0x26: Data->SMSC->Format = SMS_FORMAT_Pager;	break;
 			case 0x32: Data->SMSC->Format = SMS_FORMAT_Email;	break;
 		}
 		Data->SMSC->Validity.Format 	= SMS_Validity_RelativeFormat;
 		Data->SMSC->Validity.Relative	= msg.Buffer[8];
+		if (msg.Buffer[8] == 0x00) Data->SMSC->Validity.Relative = SMS_VALID_Max_Time;
 	
 		i=33;
 		while (msg.Buffer[i]!=0) {i++;}
 		i=i-33;
 		if (i>GSM_MAX_SMSC_NAME_LENGTH) {
 			smprintf(s, "Too long name\n");
 			return ERR_UNKNOWNRESPONSE;
 		}
 		EncodeUnicode(Data->SMSC->Name,msg.Buffer+33,i);
 		smprintf(s, "Name \"%s\"\n", DecodeUnicodeString(Data->SMSC->Name));
 	
 		GSM_UnpackSemiOctetNumber(Data->SMSC->DefaultNumber,msg.Buffer+9,true);
@@ -450,26 +454,26 @@ GSM_Error DCT3_ReplyGetNetworkInfo(GSM_Protocol_Message msg, GSM_StateMachine *s
 		case 0x04: smprintf(s, "not registered in the network");	break;
 		default  : smprintf(s, "unknown");
 	}
 	smprintf(s, "\n");
 	smprintf(s, "Network selection         : %s\n", msg.Buffer[9]==1?"manual":"automatic");
 	if (msg.Buffer[8]<0x03) {
 		sprintf(NetInfo.CID, "%02x%02x", msg.Buffer[10], msg.Buffer[11]);
 		smprintf(s, "CID                    : %s\n", NetInfo.CID);
 
 		sprintf(NetInfo.LAC, "%02x%02x", msg.Buffer[12], msg.Buffer[13]);
 		smprintf(s, "LAC                    : %s\n", NetInfo.LAC);
 
-		smprintf(s, "Network code           : %s\n", NetInfo.NetworkCode);
 		NOKIA_DecodeNetworkCode(msg.Buffer+14,NetInfo.NetworkCode);
+		smprintf(s, "Network code           : %s\n", NetInfo.NetworkCode);
 		smprintf(s, "Network name for Gammu : %s ",
 				DecodeUnicodeString(GSM_GetNetworkName(NetInfo.NetworkCode)));
 		smprintf(s, "(%s)\n",DecodeUnicodeString(GSM_GetCountryName(NetInfo.NetworkCode)));
 
 		if (msg.Length>18) {
 			if (msg.Buffer[18]==0x00) {
 				/* In 6210 name is in "normal" Unicode */
 				memcpy(name,msg.Buffer+18,msg.Buffer[17]*2);
 				name[msg.Buffer[17]*2]	=0x00;
 				name[msg.Buffer[17]*2+1]=0x00;
 				smprintf(s, "Network name for phone : %s\n",DecodeUnicodeString(name));
 			} else {
@@ -1199,29 +1203,29 @@ GSM_Error DCT3_SetWAPSettings(GSM_StateMachine *s, GSM_MultiWAPSettings *setting
 	}
 	error = DCT3DCT4_SetActiveConnectSet(s, settings);
 	if (error != ERR_NONE) return error;
 
 	return DCT3DCT4_DisableConnectionFunctions(s);
 }
 
 GSM_Error DCT3_ReplySendSMSMessage(GSM_Protocol_Message msg, GSM_StateMachine *s)
 {
 	switch (msg.Buffer[3]) {
 	case 0x02:
 		smprintf(s, "SMS sent OK\n");
-		if (s->User.SendSMSStatus!=NULL) s->User.SendSMSStatus(s->CurrentConfig->Device,0,0);
+		if (s->User.SendSMSStatus!=NULL) s->User.SendSMSStatus(s->CurrentConfig->Device,0,msg.Buffer[5]);
 		return ERR_NONE;
 	case 0x03:
 		smprintf(s, "Error %i\n",msg.Buffer[6]);
-		if (s->User.SendSMSStatus!=NULL) s->User.SendSMSStatus(s->CurrentConfig->Device,msg.Buffer[6],0);
+		if (s->User.SendSMSStatus!=NULL) s->User.SendSMSStatus(s->CurrentConfig->Device,msg.Buffer[6],-1);
 		return ERR_NONE;
 	}
 	return ERR_UNKNOWNRESPONSE;
 }
 
 GSM_Error DCT3_SendSMSMessage(GSM_StateMachine *s, GSM_SMSMessage *sms)
 {
 	int			length;
 	GSM_Error		error;
 	unsigned char 		req[256] = {N6110_FRAME_HEADER, 0x01, 0x02, 0x00};
 
 	error=PHONE_EncodeSMSFrame(s,sms,req+6,PHONE_SMSSubmit,&length, true);
diff --git a/gammu/emb/common/phone/nokia/dct3/dct3func.h b/gammu/emb/common/phone/nokia/dct3/dct3func.h
index 66b67ec..18b2026 100644
--- a/gammu/emb/common/phone/nokia/dct3/dct3func.h
+++ b/gammu/emb/common/phone/nokia/dct3/dct3func.h
@@ -1,17 +1,19 @@
 /* (c) 2002-2003 by Marcin Wiacek */
 
 #ifndef phone_nokia_dct3_h
 #define phone_nokia_dct3_h
 
+#include "../ncommon.h"
+
 GSM_Error DCT3_ReplyPressKey		(GSM_Protocol_Message msg, GSM_StateMachine *s);
 GSM_Error DCT3_ReplyPlayTone		(GSM_Protocol_Message msg, GSM_StateMachine *s);
 GSM_Error DCT3_ReplyEnableSecurity	(GSM_Protocol_Message msg, GSM_StateMachine *s);
 GSM_Error DCT3_ReplyGetIMEI		(GSM_Protocol_Message msg, GSM_StateMachine *s);
 GSM_Error DCT3_ReplyGetSMSC		(GSM_Protocol_Message msg, GSM_StateMachine *s);
 GSM_Error DCT3_ReplySIMLogin		(GSM_Protocol_Message msg, GSM_StateMachine *s);
 GSM_Error DCT3_ReplySIMLogout		(GSM_Protocol_Message msg, GSM_StateMachine *s);
 GSM_Error DCT3_ReplyGetDateTime		(GSM_Protocol_Message msg, GSM_StateMachine *s);
 GSM_Error DCT3_ReplyGetAlarm		(GSM_Protocol_Message msg, GSM_StateMachine *s);
 GSM_Error DCT3_ReplySetDateTime		(GSM_Protocol_Message msg, GSM_StateMachine *s);
 GSM_Error DCT3_ReplySetAlarm		(GSM_Protocol_Message msg, GSM_StateMachine *s);
 GSM_Error DCT3_ReplyDialCommand		(GSM_Protocol_Message msg, GSM_StateMachine *s);
diff --git a/gammu/emb/common/phone/nokia/dct3/n6110.c b/gammu/emb/common/phone/nokia/dct3/n6110.c
index 263d12b..dac6c12 100644
--- a/gammu/emb/common/phone/nokia/dct3/n6110.c
+++ b/gammu/emb/common/phone/nokia/dct3/n6110.c
@@ -1,16 +1,18 @@
 /* (c) 2001-2004 by Marcin Wiacek */
-/* based on some work from Markus Plail and Gnokii */
-/* Authentication function (c) 1999 or earlier by Pavel Janik */
 /* 5210 calendar IDs by Frederick Ros */
+/* based on some Markus Plail, Pavel Janik & others work from Gnokii (www.gnokii.org)
+ * (C) 1999-2000 Hugh Blemings & Pavel Janik ml. (C) 2001-2004 Pawel Kot 
+ * GNU GPL version 2 or later
+ */
 
 #include "../../../gsmstate.h"
 
 #ifdef GSM_ENABLE_NOKIA6110
 
 #include <string.h>
 
 #include "../../../../cfg/config.h"
 #include "../../../misc/coding/coding.h"
 #include "../../../service/sms/gsmsms.h"
 #include "../../../gsmcomon.h"
 #include "../../pfunc.h"
@@ -118,24 +120,25 @@ static void N6110_EncodeUnicode(GSM_StateMachine *s, unsigned char *dest, const
                 if (!found) {
                         i_len += EncodeWithUnicodeAlphabet(&src[i_len], &wc);
                         dest[o_len*2]           = (wc >> 8) & 0xff;
                         dest[(o_len*2)+1]       = wc & 0xff;
                 }
         }
         dest[o_len*2]           = 0;
         dest[(o_len*2)+1]       = 0;
 }
 
 #ifndef ENABLE_LGPL
 
+/* Pavel Janik */
 /* This function provides Nokia authentication protocol.
  * Nokia authentication protocol is used in the communication between Nokia
  * mobile phones (e.g. Nokia 6110) and Nokia Cellular Data Suite software,
  * commercially sold by Nokia Corp.
  * The authentication scheme is based on the token send by the phone to the
  * software. The software does it's magic (see the function
  * N6110_GetNokiaAuthentication) and returns the result back to the phone.
  * If the result is correct the phone responds with the message "Accessory
  * connected!" displayed on the LCD. Otherwise it will display "Accessory not
  * supported" and some functions will not be available for use (?).
  * The specification of the protocol is not publicly available, no comment.
  */
@@ -815,24 +818,25 @@ static GSM_Error N6110_SetRingtone(GSM_StateMachine *s, GSM_Ringtone *Ringtone,
                 memcpy(reqBin+current,DecodeUnicodeString(Ringtone->Name),UnicodeLength(Ringtone->Name));
                 current += UnicodeLength(Ringtone->Name);
                 reqBin[current++] = 0x00;
                 reqBin[current++] = 0x00;
                 reqBin[current++] = 0x00;/*xxx*/
                 memcpy(reqBin+current,Ringtone->NokiaBinary.Frame,Ringtone->NokiaBinary.Length);
                 current=current+Ringtone->NokiaBinary.Length;
                 reqBin[3]=Ringtone->Location-1;
                 if (!strcmp(s->Phone.Data.ModelInfo->model,"3210")) reqBin[5]=0x10;
                 smprintf(s, "Setting binary ringtone\n");
                 return GSM_WaitFor (s, reqBin, current, 0x40, 4, ID_SetRingtone);
         case RING_MIDI: 
+	case RING_MMF:
                 return ERR_NOTSUPPORTED;
         }
         return ERR_NOTSUPPORTED;
 }
 
 static GSM_Error N6110_ReplyGetOpLogo(GSM_Protocol_Message msg, GSM_StateMachine *s)
 {
         int                     count=5;
         GSM_Phone_Data          *Data = &s->Phone.Data;
 
         smprintf(s, "Operator logo received\n");
         NOKIA_DecodeNetworkCode(msg.Buffer+count,Data->Bitmap->NetworkCode);
@@ -1515,24 +1519,25 @@ static GSM_Error N6110_ReplyGetRingtone(GSM_Protocol_Message msg, GSM_StateMachi
                                 }
                                 i++;
                                 if (i==msg.Length-3) return ERR_EMPTY;
                         }         
                         /* Copying frame */
                         memcpy(Data->Ringtone->NokiaBinary.Frame,msg.Buffer+start,end-start);
                         Data->Ringtone->NokiaBinary.Length=end-start;
 #ifdef DEBUG
                         if (di.dl == DL_TEXTALL || di.dl == DL_TEXTALLDATE) DumpMessage(di.df, di.dl, Data->Ringtone->NokiaBinary.Frame, Data->Ringtone->NokiaBinary.Length);
 #endif
                         return ERR_NONE;
                 case RING_MIDI: 
+                case RING_MMF: 
                         return ERR_NOTSUPPORTED;
                 }
                 smprintf(s, "Ringtone format is %i\n",Data->Ringtone->Format);          
                 break;
         default:
                 smprintf(s, "Invalid location. Too high ?\n");
                 return ERR_INVALIDLOCATION;
         }
         return ERR_UNKNOWNRESPONSE;
 }
 
 static GSM_Error N6110_GetRingtone(GSM_StateMachine *s, GSM_Ringtone *Ringtone, bool PhoneRingtone)
@@ -1552,24 +1557,25 @@ static GSM_Error N6110_GetRingtone(GSM_StateMachine *s, GSM_Ringtone *Ringtone,
                         Ringtone->Format = RING_NOKIABINARY;
                 }
         }
 
         switch (Ringtone->Format) {
         case RING_NOTETONE:
                 if (!IsPhoneFeatureAvailable(s->Phone.Data.ModelInfo,F_RING_SM)) return ERR_NOTSUPPORTED;
                 break;
         case RING_NOKIABINARY:
                 if (IsPhoneFeatureAvailable(s->Phone.Data.ModelInfo,F_RING_SM)) return ERR_NOTSUPPORTED;
                 break;
         case RING_MIDI: 
+	case RING_MMF:
                 return ERR_NOTSUPPORTED;
         }
 
         error=DCT3_EnableSecurity (s, 0x01);
         if (error!=ERR_NONE) return error;
 
         req[3]=Ringtone->Location-1;
         s->Phone.Data.Ringtone=Ringtone;
         smprintf(s, "Getting (binary) ringtone\n");
         return GSM_WaitFor (s, req, 4, 0x40, 4, ID_GetRingtone);
 }
 
@@ -2434,26 +2440,26 @@ static GSM_Error N6110_GetNextCalendarNote(GSM_StateMachine *s, GSM_CalendarEntr
         if (error == ERR_NONE && Note->Entries[Time].Date.Year == 2090) {
                 error=N6110_GetDateTime(s, &date_time);
                 if (error == ERR_NONE) Note->Entries[Time].Date.Year = date_time.Year;
         }
         return error;
 }
 
 GSM_Error N6110_ReplyUSSDInfo(GSM_Protocol_Message msg, GSM_StateMachine *s)
 {
         unsigned char   buffer[2000],buffer2[4000];
         int             tmp;
 
-        tmp=GSM_UnpackEightBitsToSeven(0, 82, 82, msg.Buffer+8, buffer);
-        msg.Buffer[tmp] = 0;
+        tmp=GSM_UnpackEightBitsToSeven(0, msg.Buffer[7], 82, msg.Buffer+8, buffer);
+	buffer[tmp] = 0;
 
         smprintf(s, "USSD reply: \"%s\"\n",buffer);
 
         if (s->Phone.Data.EnableIncomingUSSD && s->User.IncomingUSSD!=NULL) {
                 EncodeUnicode(buffer2,buffer,strlen(buffer));
                 s->User.IncomingUSSD(s->CurrentConfig->Device, buffer2);
         }
 
         return ERR_NONE;
 }
 
 GSM_Error N6110_AnswerCall(GSM_StateMachine *s, int ID, bool all)
@@ -2798,24 +2804,25 @@ GSM_Phone_Functions N6110Phone = {
         N6110_GetSpeedDial,
         NOTIMPLEMENTED,                 /*      SetSpeedDial            */
         DCT3_GetSMSC,
         DCT3_SetSMSC,
         DCT3_GetSMSStatus,
         N6110_GetSMSMessage,
         N6110_GetNextSMSMessage,
         N6110_SetSMS,
         N6110_AddSMS,
         N6110_DeleteSMSMessage,
         DCT3_SendSMSMessage,
         NOTSUPPORTED,                   /*      SendSavedSMS            */
+	NOTSUPPORTED,			/*	SetFastSMSSending	*/
         NOKIA_SetIncomingSMS,
         DCT3_SetIncomingCB,
         PHONE_GetSMSFolders,
         NOTSUPPORTED,                   /*      AddSMSFolder            */
         NOTSUPPORTED,                   /*      DeleteSMSFolder         */
         N6110_DialVoice,
         N6110_AnswerCall,
         DCT3_CancelCall,
         N6110_HoldCall,
         N6110_UnholdCall,
         N6110_ConferenceCall,
         N6110_SplitCall,
@@ -2852,25 +2859,25 @@ GSM_Phone_Functions N6110Phone = {
         NOTSUPPORTED,                   /*      AddToDo                 */
         NOTSUPPORTED,                   /*      DeleteToDo              */
         NOTSUPPORTED,                   /*      DeleteAllToDo           */
         NOTIMPLEMENTED,                 /*      GetCalendarStatus       */
         NOTIMPLEMENTED,                 /*      GetCalendar             */
         N6110_GetNextCalendarNote,
         NOTIMPLEMENTED,                 /*      SetCalendar             */
         N6110_AddCalendarNote,
         N6110_DeleteCalendarNote,
         NOTIMPLEMENTED,                 /*      DeleteAllCalendar       */
         NOTSUPPORTED,                   /*      GetCalendarSettings     */
         NOTSUPPORTED,                   /*      SetCalendarSettings     */
-        NOTSUPPORTED,                   /*      GetNote                 */
+        NOTSUPPORTED,                   /*      GetNextNote             */
         N6110_GetProfile,
         N6110_SetProfile,
         NOTSUPPORTED,                   /*      GetFMStation            */
         NOTSUPPORTED,                   /*      SetFMStation            */
         NOTSUPPORTED,                   /*      ClearFMStations         */      
         NOTSUPPORTED,                   /*      GetNextFileFolder       */
         NOTSUPPORTED,                   /*      GetFilePart             */
         NOTSUPPORTED,                   /*      AddFile                 */
         NOTSUPPORTED,                   /*      GetFileSystemStatus     */
         NOTSUPPORTED,                   /*      DeleteFile              */
         NOTSUPPORTED,                   /*      AddFolder               */
         NOTSUPPORTED,                   /*      GetGPRSAccessPoint      */
diff --git a/gammu/emb/common/phone/nokia/dct3/n7110.c b/gammu/emb/common/phone/nokia/dct3/n7110.c
index 5a02c9c..b597f9b 100644
--- a/gammu/emb/common/phone/nokia/dct3/n7110.c
+++ b/gammu/emb/common/phone/nokia/dct3/n7110.c
@@ -1,14 +1,17 @@
 /* (c) 2001-2004 by Marcin Wiacek */
-/* based on some work from Markus Plail and Gnokii */
+/* based on some Markus Plail work from Gnokii (www.gnokii.org)
+ * (C) 1999-2000 Hugh Blemings & Pavel Janik ml. (C) 2001-2004 Pawel Kot 
+ * GNU GPL version 2 or later
+ */
 
 #include "../../../gsmstate.h"
 
 #ifdef GSM_ENABLE_NOKIA7110
 
 #include <string.h>
 #include <time.h>
 
 #include "../../../misc/coding/coding.h"
 #include "../../../gsmcomon.h"
 #include "../../../service/gsmlogo.h"
 #include "../../pfunc.h"
@@ -517,24 +520,25 @@ static GSM_Error N7110_GetRingtone(GSM_StateMachine *s, GSM_Ringtone *Ringtone,
 	if (Ringtone->Format == 0x00) Ringtone->Format = RING_NOKIABINARY;
 
 	switch (Ringtone->Format) {
 	case RING_NOTETONE:
 		/* In the future get binary and convert */
 		return ERR_NOTSUPPORTED;
 	case RING_NOKIABINARY:
 		req[5]=N7110_ReturnBinaryRingtoneLocation(s->Phone.Data.Model)+Ringtone->Location;
 		s->Phone.Data.Ringtone=Ringtone;
 		smprintf(s, "Getting binary ringtone\n");
 		return GSM_WaitFor (s, req, 6, 0x1f, 4, ID_GetRingtone);
 	case RING_MIDI:
+	case RING_MMF:
 		return ERR_NOTSUPPORTED;
 	}
 	return ERR_NOTSUPPORTED;
 }
 
 static GSM_Error N7110_ReplyGetPictureImageInfo(GSM_Protocol_Message msg, GSM_StateMachine *s)
 {
 	int			i;
 	GSM_Phone_N7110Data	*Priv = &s->Phone.Data.Priv.N7110;
 
 	smprintf(s, "Received info for Picture Images\n");
 	smprintf(s, "Number    : %i\n",msg.Buffer[4]*256+msg.Buffer[5]);
@@ -1638,24 +1642,25 @@ GSM_Phone_Functions N7110Phone = {
 	N7110_GetSpeedDial,
 	NOTIMPLEMENTED,			/*	SetSpeedDial		*/
 	DCT3_GetSMSC,
 	DCT3_SetSMSC,
 	N7110_GetSMSStatus,
 	N7110_GetSMSMessage,
 	N7110_GetNextSMSMessage,
 	N7110_SetSMS,
 	N7110_AddSMS,
 	N7110_DeleteSMS,
 	DCT3_SendSMSMessage,
 	NOTSUPPORTED,			/*	SendSavedSMS		*/
+	NOTSUPPORTED,			/*	SetFastSMSSending	*/
 	N7110_SetIncomingSMS,
 	DCT3_SetIncomingCB,
 	N7110_GetSMSFolders,
  	NOTIMPLEMENTED,			/* 	AddSMSFolder		*/
  	NOTIMPLEMENTED,			/* 	DeleteSMSFolder		*/
 	DCT3_DialVoice,
 	N7110_AnswerCall,
 	DCT3_CancelCall,
  	NOTIMPLEMENTED,			/* 	HoldCall 		*/
  	NOTIMPLEMENTED,			/* 	UnholdCall 		*/
  	NOTIMPLEMENTED,			/* 	ConferenceCall 		*/
  	NOTIMPLEMENTED,			/* 	SplitCall		*/
@@ -1692,25 +1697,25 @@ GSM_Phone_Functions N7110Phone = {
 	NOTSUPPORTED,			/*	AddToDo			*/
 	NOTSUPPORTED,			/*	DeleteToDo		*/
 	NOTSUPPORTED,			/*	DeleteAllToDo		*/
 	N7110_GetCalendarStatus,
 	NOTIMPLEMENTED,			/*	GetCalendar		*/
     	N7110_GetNextCalendar,
 	NOTIMPLEMENTED,			/*	SetCalendar		*/
 	N7110_AddCalendar,
 	N71_65_DelCalendar,
 	NOTIMPLEMENTED,			/*	DeleteAllCalendar	*/
 	NOTSUPPORTED,			/* 	GetCalendarSettings	*/
 	NOTSUPPORTED,			/* 	SetCalendarSettings	*/
-	NOTSUPPORTED,			/*	GetNote			*/
+	NOTSUPPORTED,			/*	GetNextNote		*/
 	N7110_GetProfile,
 	N7110_SetProfile,
     	NOTSUPPORTED,			/*  	GetFMStation        	*/
     	NOTSUPPORTED,			/*  	SetFMStation        	*/
 	NOTSUPPORTED,			/*  	ClearFMStations       	*/
 	NOTSUPPORTED,			/* 	GetNextFileFolder	*/
 	NOTSUPPORTED,			/*	GetFilePart		*/
 	NOTSUPPORTED,			/* 	AddFile			*/
 	NOTSUPPORTED, 			/* 	GetFileSystemStatus	*/
 	NOTSUPPORTED,			/*	DeleteFile		*/
 	NOTSUPPORTED,			/*	AddFolder		*/
 	NOTSUPPORTED,			/* 	GetGPRSAccessPoint	*/
diff --git a/gammu/emb/common/phone/nokia/dct3/n9210.c b/gammu/emb/common/phone/nokia/dct3/n9210.c
index e82d530..ff71ad3 100644
--- a/gammu/emb/common/phone/nokia/dct3/n9210.c
+++ b/gammu/emb/common/phone/nokia/dct3/n9210.c
@@ -310,24 +310,25 @@ GSM_Phone_Functions N9210Phone = {
 	NOTIMPLEMENTED,			/*	GetSpeedDial		*/
 	NOTIMPLEMENTED,			/*	SetSpeedDial		*/
 	DCT3_GetSMSC,
 	DCT3_SetSMSC,			/* 	FIXME: test it		*/
 	NOTIMPLEMENTED,			/*	GetSMSStatus		*/
 	NOTIMPLEMENTED,			/*	GetSMS			*/
 	NOTIMPLEMENTED,			/*	GetNextSMS		*/
 	NOTIMPLEMENTED,			/*	SetSMS			*/
 	NOTIMPLEMENTED,			/*	AddSMS			*/
 	NOTIMPLEMENTED,			/* 	DeleteSMS 		*/
 	DCT3_SendSMSMessage,
 	NOTSUPPORTED,			/*	SendSavedSMS		*/
+	NOTSUPPORTED,			/*	SetFastSMSSending	*/
 	N9210_SetIncomingSMS,
 	DCT3_SetIncomingCB,
 	NOTIMPLEMENTED,			/*	GetSMSFolders		*/
  	NOTSUPPORTED,			/* 	AddSMSFolder		*/
  	NOTSUPPORTED,			/* 	DeleteSMSFolder		*/
 	DCT3_DialVoice,
 	N9210_AnswerCall,
 	DCT3_CancelCall,
  	NOTSUPPORTED,			/* 	HoldCall 		*/
  	NOTSUPPORTED,			/* 	UnholdCall 		*/
  	NOTSUPPORTED,			/* 	ConferenceCall 		*/
  	NOTSUPPORTED,			/* 	SplitCall		*/
@@ -364,25 +365,25 @@ GSM_Phone_Functions N9210Phone = {
 	NOTSUPPORTED,			/*	AddToDo			*/
 	NOTSUPPORTED,			/*	DeleteToDo		*/
 	NOTSUPPORTED,			/*	DeleteAllToDo		*/
 	NOTSUPPORTED,			/*	GetCalendarStatus	*/
 	NOTSUPPORTED,			/*	GetCalendar		*/
     	NOTSUPPORTED,			/*  	GetNextCalendar		*/
 	NOTSUPPORTED,			/*	SetCalendar		*/
 	NOTSUPPORTED,			/*	AddCalendar		*/
 	NOTSUPPORTED,			/*	DeleteCalendar		*/
 	NOTSUPPORTED,			/*	DeleteAllCalendar	*/
 	NOTSUPPORTED,			/* 	GetCalendarSettings	*/
 	NOTSUPPORTED,			/* 	SetCalendarSettings	*/
-	NOTSUPPORTED,			/*	GetNote			*/
+	NOTSUPPORTED,			/*	GetNextNote		*/
 	NOTIMPLEMENTED, 		/*	GetProfile		*/
 	NOTSUPPORTED, 			/*	SetProfile		*/
     	NOTSUPPORTED,			/*  	GetFMStation        	*/
     	NOTSUPPORTED,			/*  	SetFMStation        	*/
         NOTSUPPORTED,           	/*      ClearFMStations         */
 	NOTSUPPORTED,			/* 	GetNextFileFolder	*/
 	NOTSUPPORTED,			/*	GetFilePart		*/
 	NOTSUPPORTED,			/* 	AddFile			*/
 	NOTSUPPORTED, 			/* 	GetFileSystemStatus	*/
 	NOTSUPPORTED,			/*	DeleteFile		*/
 	NOTSUPPORTED,			/*	AddFolder		*/
 	NOTSUPPORTED,			/* 	GetGPRSAccessPoint	*/
diff --git a/gammu/emb/common/phone/nokia/dct4/n3320.c b/gammu/emb/common/phone/nokia/dct4/n3320.c
index 51e6f18..9b1d6cd 100644
--- a/gammu/emb/common/phone/nokia/dct4/n3320.c
+++ b/gammu/emb/common/phone/nokia/dct4/n3320.c
@@ -185,24 +185,25 @@ GSM_Phone_Functions N3320Phone = {
 	NOTSUPPORTED,			/*	GetSpeedDial		*/
 	NOTSUPPORTED,			/*	SetSpeedDial		*/
 	NOTSUPPORTED,			/*	GetSMSC			*/
 	NOTSUPPORTED,			/*	SetSMSC			*/
 	NOTSUPPORTED,			/*	GetSMSStatus		*/
 	NOTSUPPORTED,			/*	GetSMS			*/
 	NOTSUPPORTED,			/*	GetNextSMS		*/
 	NOTSUPPORTED,			/*	SetSMS			*/
 	NOTSUPPORTED,			/*	AddSMS			*/
 	NOTSUPPORTED,			/* 	DeleteSMS 		*/
 	NOTSUPPORTED,			/*	SendSMS			*/
 	NOTSUPPORTED,			/*	SendSavedSMS		*/
+	NOTSUPPORTED,			/*	SetFastSMSSending	*/
 	NOTSUPPORTED,			/*	SetIncomingSMS		*/
 	NOTSUPPORTED,			/* 	SetIncomingCB		*/
 	NOTSUPPORTED,			/*	GetSMSFolders		*/
  	NOTSUPPORTED,			/* 	AddSMSFolder		*/
  	NOTSUPPORTED,			/* 	DeleteSMSFolder		*/
 	NOTIMPLEMENTED,			/*	DialVoice		*/
 	NOTIMPLEMENTED,			/*	AnswerCall		*/
 	NOTIMPLEMENTED,			/*	CancelCall		*/
  	NOTIMPLEMENTED,			/* 	HoldCall 		*/
  	NOTIMPLEMENTED,			/* 	UnholdCall 		*/
  	NOTIMPLEMENTED,			/* 	ConferenceCall 		*/
  	NOTIMPLEMENTED,			/* 	SplitCall		*/
@@ -239,25 +240,25 @@ GSM_Phone_Functions N3320Phone = {
 	NOTSUPPORTED,			/*	AddToDo			*/
 	NOTSUPPORTED,			/*	DeleteToDo		*/
 	NOTSUPPORTED,			/*	DeleteAllToDo		*/
 	N3320_GetCalendarStatus,
 	NOTIMPLEMENTED,			/*	GetCalendar		*/
     	N3320_GetNextCalendar,
 	NOTIMPLEMENTED,			/*	SetCalendar		*/
 	NOTSUPPORTED,			/*	AddCalendar		*/
 	NOTSUPPORTED,			/*	DeleteCalendar		*/
 	NOTIMPLEMENTED,			/*	DeleteAllCalendar	*/
 	NOTSUPPORTED,			/* 	GetCalendarSettings	*/
 	NOTSUPPORTED,			/* 	SetCalendarSettings	*/
-	NOTSUPPORTED,			/*	GetNote			*/
+	NOTSUPPORTED,			/*	GetNextNote		*/
 	NOTSUPPORTED, 			/*	GetProfile		*/
 	NOTSUPPORTED, 			/*	SetProfile		*/
     	NOTSUPPORTED,			/*  	GetFMStation        	*/
     	NOTSUPPORTED,			/*  	SetFMStation        	*/
     	NOTSUPPORTED,			/*  	ClearFMStations       	*/
 	NOTSUPPORTED,			/*	GetNextFileFolder	*/
 	NOTSUPPORTED,			/*	GetFilePart		*/
 	NOTIMPLEMENTED,			/*	AddFilePart		*/
 	NOTSUPPORTED,	 		/* 	GetFileSystemStatus	*/
 	NOTIMPLEMENTED,			/*	DeleteFile		*/
 	NOTIMPLEMENTED,			/*	AddFolder		*/
 	NOTSUPPORTED,			/* 	GetGPRSAccessPoint	*/
diff --git a/gammu/emb/common/phone/nokia/dct4/n3650.c b/gammu/emb/common/phone/nokia/dct4/n3650.c
index 2da55bf..d4746a7 100644
--- a/gammu/emb/common/phone/nokia/dct4/n3650.c
+++ b/gammu/emb/common/phone/nokia/dct4/n3650.c
@@ -306,24 +306,25 @@ GSM_Phone_Functions N3650Phone = {
 	NOTSUPPORTED,			/*	GetSpeedDial		*/
 	NOTSUPPORTED,			/*	SetSpeedDial		*/
 	NOTSUPPORTED,			/*	GetSMSC			*/
 	NOTSUPPORTED,			/*	SetSMSC			*/
 	NOTSUPPORTED,			/*	GetSMSStatus		*/
 	NOTSUPPORTED,			/*	GetSMS			*/
 	NOTSUPPORTED,			/*	GetNextSMS		*/
 	NOTSUPPORTED,			/*	SetSMS			*/
 	NOTSUPPORTED,			/*	AddSMS			*/
 	NOTSUPPORTED,			/* 	DeleteSMS 		*/
 	NOTSUPPORTED,			/*	SendSMS			*/
 	NOTSUPPORTED,			/*	SendSavedSMS		*/
+	NOTSUPPORTED,			/*	SetFastSMSSending	*/
 	NOTSUPPORTED,			/*	SetIncomingSMS		*/
 	NOTSUPPORTED,			/* 	SetIncomingCB		*/
 	NOTSUPPORTED,			/*	GetSMSFolders		*/
  	NOTSUPPORTED,			/* 	AddSMSFolder		*/
  	NOTSUPPORTED,			/* 	DeleteSMSFolder		*/
 	NOTIMPLEMENTED,			/*	DialVoice		*/
 	NOTIMPLEMENTED,			/*	AnswerCall		*/
 	NOTIMPLEMENTED,			/*	CancelCall		*/
  	NOTIMPLEMENTED,			/* 	HoldCall 		*/
  	NOTIMPLEMENTED,			/* 	UnholdCall 		*/
  	NOTIMPLEMENTED,			/* 	ConferenceCall 		*/
  	NOTIMPLEMENTED,			/* 	SplitCall		*/
@@ -360,25 +361,25 @@ GSM_Phone_Functions N3650Phone = {
 	NOTSUPPORTED,			/*	AddToDo			*/
 	NOTSUPPORTED,			/*	DeleteToDo		*/
 	NOTSUPPORTED,			/*	DeleteAllToDo		*/
 	NOTIMPLEMENTED,			/*	GetCalendarStatus	*/
 	NOTIMPLEMENTED,			/*	GetCalendar		*/
     	NOTSUPPORTED,			/*  	GetNextCalendar		*/
 	NOTIMPLEMENTED,			/*	SetCalendar		*/
 	NOTSUPPORTED,			/*	AddCalendar		*/
 	NOTSUPPORTED,			/*	DeleteCalendar		*/
 	NOTIMPLEMENTED,			/*	DeleteAllCalendar	*/
 	NOTSUPPORTED,			/* 	GetCalendarSettings	*/
 	NOTSUPPORTED,			/* 	SetCalendarSettings	*/
-	NOTSUPPORTED,			/*	GetNote			*/
+	NOTSUPPORTED,			/*	GetNextNote		*/
 	NOTSUPPORTED, 			/*	GetProfile		*/
 	NOTSUPPORTED, 			/*	SetProfile		*/
     	NOTSUPPORTED,			/*  	GetFMStation        	*/
     	NOTSUPPORTED,			/*  	SetFMStation        	*/
     	NOTSUPPORTED,			/*  	ClearFMStations       	*/
 	N3650_GetNextFileFolder,
 	N3650_GetFilePart,
 	NOTIMPLEMENTED,			/*	AddFilePart		*/
 	NOTSUPPORTED,	 		/* 	GetFileSystemStatus	*/
 	NOTIMPLEMENTED,			/*	DeleteFile		*/
 	NOTIMPLEMENTED,			/*	AddFolder		*/
 	NOTSUPPORTED,			/* 	GetGPRSAccessPoint	*/
diff --git a/gammu/emb/common/phone/nokia/dct4/n6510.c b/gammu/emb/common/phone/nokia/dct4/n6510.c
index 67fe492..2208def 100644
--- a/gammu/emb/common/phone/nokia/dct4/n6510.c
+++ b/gammu/emb/common/phone/nokia/dct4/n6510.c
@@ -1,14 +1,17 @@
 /* (c) 2002-2004 by Marcin Wiacek */
-/* based on some work from Markus Plail, Pawel Kot and Gnokii */
+/* based on some Markus Plail, Pawel Kot work from Gnokii (www.gnokii.org)
+ * (C) 1999-2000 Hugh Blemings & Pavel Janik ml. (C) 2001-2004 Pawel Kot 
+ * GNU GPL version 2 or later
+ */
 /* function for making CRC for filesystem (c) 2003 by Michael Schroeder */
 
 #include "../../../gsmstate.h"
 
 #ifdef GSM_ENABLE_NOKIA6510
 
 #include <string.h>
 #include <time.h>
 
 #include "../../../misc/coding/coding.h"
 #include "../../../gsmcomon.h"
 #include "../../../service/gsmlogo.h"
@@ -110,24 +113,26 @@ static GSM_Error N6510_ReplyGetSMSC(GSM_Protocol_Message msg, GSM_StateMachine *
 	}
 	memset(Data->SMSC,0,sizeof(GSM_SMSC));
 	Data->SMSC->Location 	= msg.Buffer[8];
 	Data->SMSC->Format 	= SMS_FORMAT_Text;
 	switch (msg.Buffer[10]) {
 		case 0x00: Data->SMSC->Format = SMS_FORMAT_Text; 	break;
 		case 0x22: Data->SMSC->Format = SMS_FORMAT_Fax; 	break;
 		case 0x26: Data->SMSC->Format = SMS_FORMAT_Pager;	break;
 		case 0x32: Data->SMSC->Format = SMS_FORMAT_Email;	break;
 	}
 	Data->SMSC->Validity.Format	= SMS_Validity_RelativeFormat;
 	Data->SMSC->Validity.Relative	= msg.Buffer[12];
+	if (msg.Buffer[12] == 0x00) Data->SMSC->Validity.Relative = SMS_VALID_Max_Time;
+
 	current = 14;
 	for (i=0;i<msg.Buffer[13];i++) {
 		switch (msg.Buffer[current]) {
 		case 0x81:
 			j=current+4;
 			while (msg.Buffer[j]!=0) {j++;}
 			j=j-33;
 			if (j>GSM_MAX_SMSC_NAME_LENGTH) {
 				smprintf(s, "Too long name\n");
 				return ERR_UNKNOWNRESPONSE;
 			}
 			CopyUnicodeString(Data->SMSC->Name,msg.Buffer+current+4);
@@ -976,29 +981,29 @@ static GSM_Error N6510_GetBatteryCharge(GSM_StateMachine *s, GSM_BatteryCharge *
 }
 
 static GSM_Error N6510_ReplyGetWAPBookmark(GSM_Protocol_Message msg, GSM_StateMachine *s)
 {
 	return DCT3DCT4_ReplyGetWAPBookmark (msg, s, true);
 }
 
 static GSM_Error N6510_ReplyGetOperatorLogo(GSM_Protocol_Message msg, GSM_StateMachine *s)
 {
 	GSM_Phone_Data *Data = &s->Phone.Data;
 
 	smprintf(s, "Operator logo received\n");
+	if (msg.Length == 18) return ERR_EMPTY;
 	NOKIA_DecodeNetworkCode(msg.Buffer+12,Data->Bitmap->NetworkCode);
 	smprintf(s, "Network code %s\n",Data->Bitmap->NetworkCode);
 	Data->Bitmap->BitmapWidth	= msg.Buffer[20];
 	Data->Bitmap->BitmapHeight	= msg.Buffer[21];
-	if (msg.Length == 18) return ERR_EMPTY;
 	PHONE_DecodeBitmap(GSM_Nokia6510OperatorLogo,msg.Buffer+26,Data->Bitmap);
 	return ERR_NONE;
 }
 
 GSM_Error N6510_ReplyDeleteMemory(GSM_Protocol_Message msg, GSM_StateMachine *s)
 {
 	smprintf(s, "Phonebook entry deleted\n");
 	return ERR_NONE;
 }
 
 GSM_Error N6510_DeleteMemory(GSM_StateMachine *s, GSM_MemoryEntry *entry)
 {
@@ -1756,25 +1761,26 @@ static GSM_Error N6510_GetSyncMLSettings(GSM_StateMachine *s, GSM_SyncMLSettings
 				 0x00, 0x00, 0x00, 0x31, 0x00, 
 				 0x01, //location
 				 0x00, 0x00, 0x02, 0x46, 0x00, 0x00};
 
 	settings->Connection.Location = settings->Location;
 	error = N6510_GetConnectionSettings(s, &settings->Connection, N6510_SYNCML_SETTINGS);
 	if (error != ERR_NONE) return error;
 
 	settings->Active = settings->Connection.Active;
 
 	settings->Name[0] = 0;
 	settings->Name[1] = 0;
-//	s->Phone.Data.SyncMLSettings  = settings;
+	s->Phone.Data.SyncMLSettings  = settings;
+
 //	smprintf(s, "Getting SyncML settings name\n");
 //	error = GSM_WaitFor (s, NameReq, 16, 0x43, 4, ID_GetSyncMLName);
 //	if (error != ERR_NONE) return error;
 
 	req[9] = settings->Location - 1;
 	smprintf(s, "Getting additional SyncML settings\n");
 	return GSM_WaitFor (s, req, 16, 0x43, 4, ID_GetSyncMLSettings);
 }
 
 static GSM_Error N6510_ReplyGetChatSettings(GSM_Protocol_Message msg, GSM_StateMachine *s)
 {
 	GSM_ChatSettings 	*Sett = s->Phone.Data.ChatSettings;
@@ -2274,25 +2280,25 @@ static GSM_Error N6510_DeleteSMSMessage(GSM_StateMachine *s, GSM_SMSMessage *sms
 	}
 	req[6]=location / 256;
 	req[7]=location;
 
 	smprintf(s, "Deleting sms\n");
 	return GSM_WaitFor (s, req, 10, 0x14, 4, ID_DeleteSMSMessage);
 }
 
 static GSM_Error N6510_ReplySendSMSMessage(GSM_Protocol_Message msg, GSM_StateMachine *s)
 {
 	switch (msg.Buffer[8]) {
 	case 0x00:
-		smprintf(s, "SMS sent OK, TPMR for sent sms is %02x\n",msg.Buffer[10]);
+		smprintf(s, "SMS sent OK, TPMR for sent sms is %d\n",msg.Buffer[10]);
 		if (s->User.SendSMSStatus!=NULL) s->User.SendSMSStatus(s->CurrentConfig->Device,0,msg.Buffer[10]);
 		return ERR_NONE;
 	default:
 		smprintf(s, "SMS not sent OK, error code probably %i\n",msg.Buffer[8]);
 		if (s->User.SendSMSStatus!=NULL) s->User.SendSMSStatus(s->CurrentConfig->Device,msg.Buffer[8],msg.Buffer[10]);
 		return ERR_NONE;
 	}
 }
 
 static GSM_Error N6510_SendSMSMessage(GSM_StateMachine *s, GSM_SMSMessage *sms)
 {
 	int			length = 11;
@@ -2761,24 +2767,25 @@ static GSM_Error N6510_GetRingtone(GSM_StateMachine *s, GSM_Ringtone *Ringtone,
 		return ERR_NOTSUPPORTED;
 	case RING_NOKIABINARY:
 		s->Phone.Data.Ringtone	= Ringtone;
 		Info.Number 		= 0;
 		error=N6510_PrivGetRingtonesInfo(s, &Info, PhoneRingtone);
 		if (error != ERR_NONE) return error;
 		if (Ringtone->Location > Info.Number) return ERR_INVALIDLOCATION;
 		req2[4] = Info.Ringtone[Ringtone->Location-1].ID / 256;
 		req2[5] = Info.Ringtone[Ringtone->Location-1].ID % 256;
 		smprintf(s, "Getting binary ringtone\n");
 		return GSM_WaitFor (s, req2, 6, 0x1f, 4, ID_GetRingtone);
 	case RING_MIDI:
+	case RING_MMF:
 		return ERR_NOTSUPPORTED;
 	}
 	return ERR_NOTSUPPORTED;
 }
 
 static GSM_Error N6510_PlayTone(GSM_StateMachine *s, int Herz, unsigned char Volume, bool start)
 {
 	GSM_Error 	error;
 	unsigned char 	reqStart[] = {
 		0x00,0x06,0x01,0x00,0x07,0x00 };
 	unsigned char 	reqPlay[] = {
 		0x00,0x06,0x01,0x14,0x05,0x04,
@@ -2977,24 +2984,27 @@ static GSM_Error N6510_GetProfile(GSM_StateMachine *s, GSM_Profile *Profile)
 	unsigned char 	req[150]    = {N6110_FRAME_HEADER, 0x01, 0x01, 0x0C, 0x01};
 	unsigned char	reqActive[] = {N6110_FRAME_HEADER, 0x05};
 	int 		i, length = 7;
 	GSM_Error	error;
 
 	/* For now !!! */
 	if (!strcmp(s->Phone.Data.ModelInfo->model,"3510")) {
 		if (s->Phone.Data.VerNum>3.37) return ERR_NOTSUPPORTED;
 	}
 	if (!strcmp(s->Phone.Data.ModelInfo->model,"6230")) {
 		return ERR_NOTSUPPORTED;
 	}
+	if (!strcmp(s->Phone.Data.ModelInfo->model,"5140")) {
+		return ERR_NOTSUPPORTED;
+	}
 
 	if (Profile->Location>5) return ERR_INVALIDLOCATION;
 
 	for (i = 0; i < 0x0a; i++) {
 		req[length++] = 0x04;
 		req[length++] = Profile->Location;
 		req[length++] = i;
 		req[length++] = 0x01;
 	}
 
 	req[length++] = 0x04;
 	req[length++] = Profile->Location;
@@ -3106,52 +3116,76 @@ static GSM_Error N6510_ReplyIncomingSMS(GSM_Protocol_Message msg, GSM_StateMachi
 		sms.State 	 = SMS_UnRead;
 		sms.InboxFolder  = true;
 
 		N6510_DecodeSMSFrame(s, &sms, msg.Buffer+10);
 
 		s->User.IncomingSMS(s->CurrentConfig->Device,sms);
 	}
 	return ERR_NONE;
 }
 
 static GSM_Error N6510_DialVoice(GSM_StateMachine *s, char *number, GSM_CallShowNumber ShowNumber)
 {
+	unsigned int 	pos2 = 15;
 	unsigned int	pos = 4;
+	unsigned char 	req2[100] = {N6110_FRAME_HEADER,0x01,
+				    0x00,0x02,0x07,0x04,
+				    0x01,  // 1 - voice, 2 - data
+				    0x00,0x03,
+				    0x18,  // length of rest + 1
+				    0x00,0x00,0x00};
 	unsigned char 	req[100] = {N6110_FRAME_HEADER,0x01,
 				    0x0c};	/* Number length */
+	GSM_Error	error;
+
+	/* USSD not supported */
+	if (number[0] == '*') return ERR_NOTSUPPORTED;
+	if (number[0] == '#') return ERR_NOTSUPPORTED;
 
 	req[pos++] = strlen(number);
 	EncodeUnicode(req+pos,number,strlen(number));
 	pos += strlen(number)*2;
 	req[pos++] = 0x05; /* call type: voice - 0x05, data - 0x01 */
 	req[pos++] = 0x01;
 	req[pos++] = 0x05;
 	req[pos++] = 0x00;
 	req[pos++] = 0x02;
 	req[pos++] = 0x00;
 	req[pos++] = 0x00;
 	switch (ShowNumber) {
 	case GSM_CALL_HideNumber:
 		req[pos++] = 0x02;
 		break;
 	case GSM_CALL_ShowNumber:
 		req[pos++] = 0x03;
 		break;
 	case GSM_CALL_DefaultNumberPresence:
 		req[pos++] = 0x01;
 		break;
 	}
+	smprintf(s, "Making voice call\n");
+	error = GSM_WaitFor (s, req, pos, 0x01, 4, ID_DialVoice);
+	if (error != ERR_NOTSUPPORTED) return error;
+
+	if (ShowNumber != GSM_CALL_DefaultNumberPresence) return ERR_NOTSUPPORTED;
+
+	req2[11] = strlen(number)*2+6;
+	req2[pos2++] = strlen(number);
+	EncodeUnicode(req2+pos2,number,strlen(number));
+	pos2 += strlen(number)*2;
 
 	smprintf(s, "Making voice call\n");
-	return GSM_WaitFor (s, req, pos, 0x01, 4, ID_DialVoice);
+	error = GSM_WaitFor (s, req2, pos2, 0x01, 4, ID_DialVoice);
+	if (error == ERR_NOTSUPPORTED) return ERR_NONE;
+	return error;
 }
 
 /* method 3 */
 static GSM_Error N6510_ReplyGetCalendarInfo3(GSM_Protocol_Message msg, GSM_StateMachine *s, GSM_NOKIACalToDoLocations *Last)
 {
 	int i=0,j=0;
 
 	while (Last->Location[j] != 0x00) j++;
 	if (j >= GSM_MAXCALENDARTODONOTES) {
 		smprintf(s, "Increase GSM_MAXCALENDARTODONOTES\n");
 		return ERR_UNKNOWN;
 	}
@@ -3165,63 +3199,69 @@ static GSM_Error N6510_ReplyGetCalendarInfo3(GSM_Protocol_Message msg, GSM_State
 		smprintf(s, "%i ",Last->Location[j-1]);
 		i++;
 	}
 	smprintf(s, "\nNumber of Entries in frame: %i\n",i);
 	Last->Location[j] = 0;
 	smprintf(s, "\n");
 	if (i == 1 && msg.Buffer[12+0*4]*256+msg.Buffer[13+0*4] == 0) return ERR_EMPTY;
 	if (i == 0) return ERR_EMPTY;
 	return ERR_NONE;
 }
 
 /* method 3 */
-static GSM_Error N6510_GetCalendarInfo3(GSM_StateMachine *s, GSM_NOKIACalToDoLocations *Last, bool Calendar)
+static GSM_Error N6510_GetCalendarInfo3(GSM_StateMachine *s, GSM_NOKIACalToDoLocations *Last, char Type)
 {
-	GSM_Error 	error;
+	GSM_Error 	error = ERR_UNKNOWN;
 	int		i;
 	unsigned char   req[] = {N6110_FRAME_HEADER, 0x9E, 0xFF, 0xFF, 0x00, 0x00,
 			         0x00, 0x00,	/* First location */
-			         0x00};		/* 0 = calendar, 1 = ToDo in 6610 style */
+			         0x00};		/* 0 = calendar, 1 = ToDo in 6610 style, 2 = Notes */
 
 	Last->Location[0] = 0x00;
 	Last->Number	  = 0;
 
-	if (Calendar) {
+	req[10] = Type;	
+	if (Type == 0) {
 		smprintf(s, "Getting locations for calendar method 3\n");
 		error = GSM_WaitFor (s, req, 11, 0x13, 4, ID_GetCalendarNotesInfo);
-	} else {
-		req[10] = 0x01;
+	} else if (Type == 1) {
 		smprintf(s, "Getting locations for ToDo method 2\n");
 		error = GSM_WaitFor (s, req, 11, 0x13, 4, ID_GetToDo);
+	} else if (Type == 2) {
+		smprintf(s, "Getting locations for Notes\n");
+		error = GSM_WaitFor (s, req, 11, 0x13, 4, ID_GetNote);
 	}
 	if (error != ERR_NONE && error != ERR_EMPTY) return error;
 
 	while (1) {
 		i=0;
 		while (Last->Location[i] != 0x00) i++;
 		smprintf(s, "i = %i %i\n",i,Last->Number);
 		if (i == Last->Number) break;
 		if (i != Last->Number && error == ERR_EMPTY) {
 			smprintf(s, "Phone doesn't support some notes with this method. Workaround\n");
 			Last->Number = i;
 			break;
 		}
 		req[8] = Last->Location[i-1] / 256;
 		req[9] = Last->Location[i-1] % 256;
-		if (Calendar) {
+		if (Type == 0) {
 			smprintf(s, "Getting locations for calendar method 3\n");
 			error = GSM_WaitFor (s, req, 11, 0x13, 4, ID_GetCalendarNotesInfo);
-		} else {
+		} else if (Type == 1) {
 			smprintf(s, "Getting locations for todo method 2\n");
 			error = GSM_WaitFor (s, req, 11, 0x13, 4, ID_GetToDo);
+		} else if (Type == 2) {
+			smprintf(s, "Getting locations for Notes\n");
+			error = GSM_WaitFor (s, req, 11, 0x13, 4, ID_GetNote);
 		}
 		if (error != ERR_NONE && error != ERR_EMPTY) return error;
 	}
 	return ERR_NONE;
 }
 
 /* method 3 */
 GSM_Error N6510_ReplyGetCalendar3(GSM_Protocol_Message msg, GSM_StateMachine *s)
 {
 	GSM_CalendarEntry 		*entry = s->Phone.Data.Cal;
 	GSM_DateTime			Date;
 	unsigned long			diff;
@@ -3341,69 +3381,75 @@ GSM_Error N6510_ReplyGetCalendar3(GSM_Protocol_Message msg, GSM_StateMachine *s)
 	}
 	if (entry->Type == GSM_CAL_MEETING) {
 		memcpy(entry->Entries[entry->EntriesNum].Text, msg.Buffer+(54+msg.Buffer[51]*2), msg.Buffer[52]*2);
 		entry->Entries[entry->EntriesNum].Text[msg.Buffer[52]*2]   = 0;
 		entry->Entries[entry->EntriesNum].Text[msg.Buffer[52]*2+1] = 0;
 		entry->Entries[entry->EntriesNum].EntryType		   = CAL_LOCATION;
 		entry->EntriesNum++;
 	}
 
 	return ERR_NONE;
 }
 
+static GSM_Error N6510_PrivGetGenericCalendar3(GSM_StateMachine *s, int Location, GSM_Phone_RequestID ID)
+{
+	unsigned char req[] = {N6110_FRAME_HEADER,0x7D,0x00,0x00,0x00,0x00,
+			       0x00,0x99,	/* Location */
+			       0xff,0xff,0xff,0xff};	
+
+	req[8] = Location / 256;
+	req[9] = Location % 256;
+
+	return GSM_WaitFor (s, req, 14, 0x13, 4, ID);
+}
+
 static GSM_Error N6510_PrivGetCalendar3(GSM_StateMachine *s, GSM_CalendarEntry *Note, bool start, int *LastCalendarYear)
 {
 	GSM_Error		error;
 	GSM_DateTime		date_time;
-	unsigned char 		req[] = {N6110_FRAME_HEADER,0x7D,0x00,0x00,0x00,0x00,
-					 0x00,0x99,	/* Location */
-					 0xff,0xff,0xff,0xff,0x01};	
 
 	if (start) {
 		/* We have to get current year. It's NOT written in frame for
 		 * Birthday
 		 */
 		error=s->Phone.Functions->GetDateTime(s,&date_time);
 		switch (error) {
 			case ERR_EMPTY:
 			case ERR_NOTIMPLEMENTED:
 				GSM_GetCurrentDateTime(&date_time);
 				break;
 			case ERR_NONE:
 				break;
 			default:
 				return error;
 		}
 		*LastCalendarYear = date_time.Year;
 	}
 
 	Note->EntriesNum		= 0;
 	Note->Entries[0].Date.Year 	= *LastCalendarYear;
 
-	req[8] = Note->Location / 256;
-	req[9] = Note->Location % 256;
-                        
 	s->Phone.Data.Cal=Note;
 	smprintf(s, "Getting calendar note method 3\n");
-	return GSM_WaitFor (s, req, 15, 0x13, 4, ID_GetCalendarNote);
+	return N6510_PrivGetGenericCalendar3(s, Note->Location, ID_GetCalendarNote);
 }
 
 /* method 3 */
 GSM_Error N6510_GetNextCalendar3(GSM_StateMachine *s, GSM_CalendarEntry *Note, bool start, GSM_NOKIACalToDoLocations *LastCalendar, int *LastCalendarYear, int *LastCalendarPos)
 {
 	GSM_Error error;
 	bool	  start2;
 
 	if (start) {
-		error=N6510_GetCalendarInfo3(s,LastCalendar,true);
+		error=N6510_GetCalendarInfo3(s,LastCalendar,0);
 		if (error!=ERR_NONE) return error;
 		if (LastCalendar->Number == 0) return ERR_EMPTY;
 
 		*LastCalendarPos = 0;
 	} else {
 		(*LastCalendarPos)++;
 	}
 
 	error  = ERR_EMPTY;
 	start2 = start;
 	while (error == ERR_EMPTY) {
 		if (*LastCalendarPos >= LastCalendar->Number) return ERR_EMPTY;
@@ -3468,42 +3514,42 @@ static GSM_Error N6510_FindCalendarIconID3(GSM_StateMachine *s, GSM_CalendarEntr
 	GSM_Error			error;
 	bool				found;
 
 	for(i=0;i<Priv->CalendarIconsNum;i++) {
 		if (Priv->CalendarIconsTypes[i] == Entry->Type) {
 			*ID = Priv->CalendarIcons[i];
 			return ERR_NONE;
 		}
 	}
 
 	smprintf(s, "Starting finding note ID\n");
 
-	error=N6510_GetCalendarInfo3(s, &Priv->LastCalendar,true);
+	error=N6510_GetCalendarInfo3(s, &Priv->LastCalendar,0);
 	memcpy(&LastCalendar1,&Priv->LastCalendar,sizeof(GSM_NOKIACalToDoLocations));
 	if (error != ERR_NONE) return error;
 
 	if (IsPhoneFeatureAvailable(s->Phone.Data.ModelInfo, F_CAL35) ||
 	    IsPhoneFeatureAvailable(s->Phone.Data.ModelInfo, F_CAL65) ||
 	    IsPhoneFeatureAvailable(s->Phone.Data.ModelInfo, F_CAL62)) {
 		error=N71_65_AddCalendar2(s,Entry);
 	} else {
 		if (Entry->Type == GSM_CAL_MEETING) {
 			error=N71_65_AddCalendar1(s, Entry, &s->Phone.Data.Priv.N6510.FirstCalendarPos);
 		} else {
 			error=N71_65_AddCalendar2(s,Entry);
 		}
 	}
 	if (error != ERR_NONE) return error;
 
-	error=N6510_GetCalendarInfo3(s, &Priv->LastCalendar,true);
+	error=N6510_GetCalendarInfo3(s, &Priv->LastCalendar,0);
 	memcpy(&LastCalendar2,&Priv->LastCalendar,sizeof(GSM_NOKIACalToDoLocations));
 	if (error != ERR_NONE) return error;
 
 	smprintf(s,"Number of entries: %i %i\n",LastCalendar1.Number,LastCalendar2.Number);
 
 	for(i=0;i<LastCalendar2.Number;i++) {
 		found = true;
 		for(j=0;j<LastCalendar1.Number;j++) {
 			if (LastCalendar1.Location[j] == LastCalendar2.Location[i]) {
 				found = false;
 				break;
 			}
@@ -3728,25 +3774,25 @@ static GSM_Error N6510_GetCalendarStatus(GSM_StateMachine *s, GSM_CalendarStatus
 
 	if (IsPhoneFeatureAvailable(s->Phone.Data.ModelInfo, F_CAL62)) {
 	        /* Method 1 */
 		error=N71_65_GetCalendarInfo1(s, &s->Phone.Data.Priv.N6510.LastCalendar);
 		if (error!=ERR_NONE) return error;
 		Status->Used = s->Phone.Data.Priv.N6510.LastCalendar.Number;
 		return ERR_NONE;
 
 	    	/* Method 2 */
 //		return ERR_NOTSUPPORTED;		
 	} else {
 		/* Method 3 */
-		error=N6510_GetCalendarInfo3(s,&s->Phone.Data.Priv.N6510.LastCalendar,true);
+		error=N6510_GetCalendarInfo3(s,&s->Phone.Data.Priv.N6510.LastCalendar,0);
 		if (error!=ERR_NONE) return error;
 		Status->Used = s->Phone.Data.Priv.N6510.LastCalendar.Number;
 		return ERR_NONE;
 	}
 }
 
 static GSM_Error N6510_AddCalendar(GSM_StateMachine *s, GSM_CalendarEntry *Note)
 {
 #ifdef GSM_FORCE_DCT4_CALENDAR_6210
 	return N71_65_AddCalendar2(s,Note);
 #endif
 
@@ -3963,24 +4009,60 @@ static GSM_Error N6510_ShowStartInfo(GSM_StateMachine *s, bool enable)
 		return N6510_SetLight(s,N6510_LIGHT_KEYPAD,true);
 	} else {
 		error=N6510_SetLight(s,N6510_LIGHT_DISPLAY,false);
 		if (error != ERR_NONE) return error;
 
 		error=N6510_SetLight(s,N6510_LIGHT_TORCH,false);
 		if (error != ERR_NONE) return error;
 
 		return N6510_SetLight(s,N6510_LIGHT_KEYPAD,false);
 	}
 }
 
+static GSM_Error N6510_ReplyGetNoteInfo(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+	return N6510_ReplyGetCalendarInfo3(msg, s, &s->Phone.Data.Priv.N6510.LastNote);
+}
+
+static GSM_Error N6510_ReplyGetNote(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+	smprintf(s, "Note received\n");
+	memcpy(s->Phone.Data.Note->Text,msg.Buffer+54,(msg.Buffer[50]*256+msg.Buffer[51])*2);
+	s->Phone.Data.Note->Text[(msg.Buffer[50]*256+msg.Buffer[51])*2] = 0;
+	s->Phone.Data.Note->Text[(msg.Buffer[50]*256+msg.Buffer[51])*2+1] = 0;
+	return ERR_NONE;
+}
+
+GSM_Error N6510_GetNextNote(GSM_StateMachine *s, GSM_NoteEntry *Note, bool start)
+{
+	GSM_Error 			error;
+	GSM_NOKIACalToDoLocations	*LastNote = &s->Phone.Data.Priv.N6510.LastNote;	
+
+	if (!IsPhoneFeatureAvailable(s->Phone.Data.ModelInfo, F_NOTES)) return ERR_NOTSUPPORTED;
+
+	if (start) {
+		error=N6510_GetCalendarInfo3(s,LastNote,2);
+		if (error!=ERR_NONE) return error;
+		Note->Location = 1;
+	} else {
+		Note->Location++;
+	}
+		
+	if (Note->Location > LastNote->Number) return ERR_EMPTY;
+
+	s->Phone.Data.Note = Note;
+	smprintf(s, "Getting note\n");
+	return N6510_PrivGetGenericCalendar3(s, LastNote->Location[Note->Location-1], ID_GetNote);
+}
+
 static int N6510_FindFileCheckSum(unsigned char *ptr, int len)
 {
 	int acc, i, accx;
  
 	accx = 0;
 	acc  = 0xffff; 
 	while (len--) {
 		accx = (accx & 0xffff00ff) | (acc & 0xff00);
 		acc  = (acc  & 0xffff00ff) | *ptr++ << 8;
 		for (i = 0; i < 8; i++) {
 			acc <<= 1;
 			if (acc & 0x10000)     acc ^= 0x1021; 
@@ -4046,25 +4128,25 @@ static GSM_Error N6510_ReplyGetFileFolderInfo(GSM_Protocol_Message msg, GSM_Stat
 			else if (msg.Buffer[i]==0x02 && msg.Buffer[i+2]==0x05)
 				File->Type = GSM_File_Image_GIF;
 			else if (msg.Buffer[i]==0x02 && msg.Buffer[i+2]==0x09)
 				File->Type = GSM_File_Image_WBMP;
                         else if (msg.Buffer[i]==0x04 && msg.Buffer[i+2]==0x01)
                                 File->Type = GSM_File_Sound_AMR;
                         else if (msg.Buffer[i]==0x04 && msg.Buffer[i+2]==0x02)
                                 File->Type = GSM_File_Sound_MIDI;
                         else if (msg.Buffer[i]==0x08 && msg.Buffer[i+2]==0x05)
                                 File->Type = GSM_File_Video_3GP;
                         else if (msg.Buffer[i]==0x10 && msg.Buffer[i+2]==0x01)
                                 File->Type = GSM_File_Java_JAR;
-#if DEVELOP
+#ifdef DEVELOP
 			else if (msg.Buffer[i]==0x00 && msg.Buffer[i+2]==0x01)
 				File->Type = GSM_File_MMS;
 #endif
 		}
 		return ERR_NONE;	
 	case 0x2F:
 		smprintf(s,"File or folder used bytes received\n");
 		File->Used = msg.Buffer[6]*256*256*256+
 			     msg.Buffer[7]*256*256+
 			     msg.Buffer[8]*256+
 			     msg.Buffer[9];
 		return ERR_NONE;
@@ -4389,25 +4471,25 @@ static GSM_Error N6510_AddFilePart(GSM_StateMachine *s, GSM_File *File, int *Pos
 		0x01, 0x28}; 		/* length */
 	unsigned char end[30] = {
 		N7110_FRAME_HEADER, 0x40, 0x00, 0x00, 0x00, 0x01,
 		0x00, 0x04, 		/* file ID */
 		0x00, 0x00, 0x00, 0x00};
 
 	if (IsPhoneFeatureAvailable(s->Phone.Data.ModelInfo, F_NOFILESYSTEM)) return ERR_NOTSUPPORTED;
 
 	s->Phone.Data.File = File;
 
 	if (*Pos == 0) {
 		error = N6510_SearchForFileName(s,File);
-		if (error == ERR_NONE) return ERR_INVALIDLOCATION;
+		if (error == ERR_NONE) return ERR_FILEALREADYEXIST;
 		if (error != ERR_EMPTY) return error;
 
 		Header[8] = atoi(File->ID_FullName) / 256;
 		Header[9] = atoi(File->ID_FullName) % 256;
 		memset(Header+14, 0x00, 300);
 		CopyUnicodeString(Header+14,File->Name);
                 Header[222] = File->Used / (256*256*256);
                 Header[223] = File->Used / (256*256);
                 Header[224] = File->Used / 256;
                 Header[225] = File->Used % 256;
 		switch(File->Type) {
 			case GSM_File_Image_JPG    : Header[231]=0x02; Header[233]=0x01; break;
@@ -4805,25 +4887,25 @@ static GSM_Error N6510_GetToDoStatus1(GSM_StateMachine *s, GSM_ToDoStatus *statu
 	error = GSM_WaitFor (s, reqLoc, 10, 0x55, 4, ID_GetToDo);
 	if (error != ERR_NONE) return error;
 
 	status->Used = LastToDo->Number;
 	return ERR_NONE;
 }
 
 static GSM_Error N6510_GetToDoStatus2(GSM_StateMachine *s, GSM_ToDoStatus *status)
 {
 	GSM_NOKIACalToDoLocations	*LastToDo = &s->Phone.Data.Priv.N6510.LastToDo;
 	GSM_Error			error;
 
-	error = N6510_GetCalendarInfo3(s,LastToDo,false);
+	error = N6510_GetCalendarInfo3(s,LastToDo,1);
 	if (error!=ERR_NONE) return error;
 
 	status->Used = LastToDo->Number;
 	return ERR_NONE;
 }
 
 static GSM_Error N6510_GetToDoStatus(GSM_StateMachine *s, GSM_ToDoStatus *status)
 {
 	status->Used = 0;
 
 	if (IsPhoneFeatureAvailable(s->Phone.Data.ModelInfo, F_TODO63)) {
 		return N6510_GetToDoStatus1(s, status);
@@ -4935,26 +5017,25 @@ static GSM_Error N6510_ReplyGetToDo2(GSM_Protocol_Message msg, GSM_StateMachine
 	Date.Minute 	= msg.Buffer[33];
 	Date.Second	= 0;
 
 	Last->EntriesNum = 2;
 
 	if (msg.Buffer[45] == 0x01) {
 		Last->Entries[2].Number		= msg.Buffer[45];
 	    	Last->Entries[2].EntryType 	= TODO_COMPLETED;
 		Last->EntriesNum++;
 		smprintf(s,"Completed\n");
 	}
 
-	if (msg.Buffer[14] == 0xFF && msg.Buffer[15] == 0xFF && msg.Buffer[16] == 0xff && msg.Buffer[17] == 0xff)
-	{
+	if (msg.Buffer[14] == 0xFF && msg.Buffer[15] == 0xFF && msg.Buffer[16] == 0xff && msg.Buffer[17] == 0xff) {
 		smprintf(s, "No alarm\n");
 	} else {
 		diff  = ((unsigned int)msg.Buffer[14]) << 24;
 		diff += ((unsigned int)msg.Buffer[15]) << 16;
 		diff += ((unsigned int)msg.Buffer[16]) << 8;
 		diff += msg.Buffer[17];
 
 		memcpy(&Last->Entries[Last->EntriesNum].Date,&Date,sizeof(GSM_DateTime));
 		GetTimeDifference(diff, &Last->Entries[Last->EntriesNum].Date, false, 60);
 		smprintf(s, "Alarm date   : %02i-%02i-%04i %02i:%02i:%02i\n",
 			Last->Entries[Last->EntriesNum].Date.Day,   Last->Entries[Last->EntriesNum].Date.Month,
 			Last->Entries[Last->EntriesNum].Date.Year,  Last->Entries[Last->EntriesNum].Date.Hour,
@@ -4969,46 +5050,38 @@ static GSM_Error N6510_ReplyGetToDo2(GSM_Protocol_Message msg, GSM_StateMachine
 		}
 		Last->EntriesNum++;
 	}
 	
 	return ERR_NONE;
 }
 
 /* ToDo support - 6610 style */
 static GSM_Error N6510_GetNextToDo2(GSM_StateMachine *s, GSM_ToDoEntry *ToDo, bool refresh)
 {
 	GSM_Error 			error;
 	GSM_NOKIACalToDoLocations	*LastToDo = &s->Phone.Data.Priv.N6510.LastToDo;	
-	/* The same to getting calendar method 3 */
-	unsigned char 			req[] = { 
-		N6110_FRAME_HEADER,0x7D,0x00,0x00,0x00,0x00,
-		0x00,0x99,			/* Location */
-		0xff,0xff,0xff,0xff,0x01};	
 
 	if (refresh) {
-		error=N6510_GetCalendarInfo3(s,LastToDo,false);
+		error=N6510_GetCalendarInfo3(s,LastToDo,1);
 		if (error!=ERR_NONE) return error;
 		ToDo->Location = 1;
 	} else {
 		ToDo->Location++;
 	}
 		
 	if (ToDo->Location > LastToDo->Number) return ERR_EMPTY;
 
-	req[8] = LastToDo->Location[ToDo->Location-1] / 256;
-	req[9] = LastToDo->Location[ToDo->Location-1] % 256;
-                        
 	s->Phone.Data.ToDo = ToDo;	
 	smprintf(s, "Getting todo method 2\n");
-	return GSM_WaitFor (s, req, 15, 0x13, 4, ID_GetToDo);
+	return N6510_PrivGetGenericCalendar3(s, LastToDo->Location[ToDo->Location-1], ID_GetToDo);
 }
 
 static GSM_Error N6510_GetNextToDo(GSM_StateMachine *s, GSM_ToDoEntry *ToDo, bool refresh)
 {
 	if (IsPhoneFeatureAvailable(s->Phone.Data.ModelInfo, F_TODO63)) {
 		return N6510_GetNextToDo1(s, ToDo, refresh);
 	} else if (IsPhoneFeatureAvailable(s->Phone.Data.ModelInfo, F_TODO66)) {
 		return N6510_GetNextToDo2(s, ToDo, refresh);
 	} else {
 		return ERR_NOTSUPPORTED;
 	}
 }
@@ -5034,25 +5107,25 @@ static GSM_Error N6510_DeleteAllToDo1(GSM_StateMachine *s)
 }
 
 static GSM_Error N6510_DeleteToDo2(GSM_StateMachine *s, GSM_ToDoEntry *ToDo)
 {
 	GSM_Error 			error;
 	GSM_NOKIACalToDoLocations	*LastToDo = &s->Phone.Data.Priv.N6510.LastToDo;	
 	GSM_CalendarEntry		Note;
 
 	if (!IsPhoneFeatureAvailable(s->Phone.Data.ModelInfo, F_TODO66)) {
 		return ERR_NOTSUPPORTED;
 	}
 
-	error=N6510_GetCalendarInfo3(s,LastToDo,false);
+	error=N6510_GetCalendarInfo3(s,LastToDo,1);
 	if (error!=ERR_NONE) return error;
 
 	smprintf(s, "Deleting ToDo method 2\n");
 
 	if (ToDo->Location > LastToDo->Number || ToDo->Location == 0) return ERR_INVALIDLOCATION;
 
 	Note.Location = LastToDo->Location[ToDo->Location-1];
 	return N71_65_DelCalendar(s,&Note);
 }
 
 /* ToDo support - 6310 style */
 static GSM_Error N6510_ReplyGetToDoFirstLoc1(GSM_Protocol_Message msg, GSM_StateMachine *s)
@@ -5442,31 +5515,37 @@ static GSM_Reply_Function N6510ReplyFunctions[] = {
 	{N71_65_ReplyCallInfo,		  "\x01",0x03,0x02,ID_IncomingFrame	  },
 	{N71_65_ReplyCallInfo,		  "\x01",0x03,0x03,ID_IncomingFrame	  },
 	{N71_65_ReplyCallInfo,		  "\x01",0x03,0x04,ID_IncomingFrame	  },
 	{N71_65_ReplyCallInfo,		  "\x01",0x03,0x05,ID_IncomingFrame	  },
 	{N71_65_ReplyCallInfo,		  "\x01",0x03,0x07,ID_AnswerCall	  },
 	{N71_65_ReplyCallInfo,		  "\x01",0x03,0x07,ID_IncomingFrame	  },
 	{N71_65_ReplyCallInfo,		  "\x01",0x03,0x09,ID_CancelCall	  },
 	{N71_65_ReplyCallInfo,		  "\x01",0x03,0x09,ID_IncomingFrame	  },
 	{N71_65_ReplyCallInfo,		  "\x01",0x03,0x0A,ID_IncomingFrame	  },
 	{N71_65_ReplyCallInfo,		  "\x01",0x03,0x0B,ID_IncomingFrame	  },
 	{N71_65_ReplyCallInfo,		  "\x01",0x03,0x0C,ID_DialVoice		  },
 	{N71_65_ReplyCallInfo,		  "\x01",0x03,0x0C,ID_IncomingFrame	  },
+	{N71_65_ReplyCallInfo,		  "\x01",0x03,0x0F,ID_IncomingFrame	  },
+	{N71_65_ReplyCallInfo,		  "\x01",0x03,0x10,ID_DialVoice		  },
+	{N71_65_ReplyCallInfo,		  "\x01",0x03,0x10,ID_IncomingFrame	  },
 	{N71_65_ReplyCallInfo,		  "\x01",0x03,0x23,ID_IncomingFrame	  },
 	{N71_65_ReplyCallInfo,		  "\x01",0x03,0x25,ID_IncomingFrame	  },
 	{N71_65_ReplyCallInfo,		  "\x01",0x03,0x27,ID_IncomingFrame	  },
 	{N71_65_ReplySendDTMF,		  "\x01",0x03,0x51,ID_SendDTMF		  },
 	{N71_65_ReplyCallInfo,		  "\x01",0x03,0x53,ID_IncomingFrame	  },
 	{N71_65_ReplySendDTMF,		  "\x01",0x03,0x59,ID_SendDTMF		  },
 	{N71_65_ReplySendDTMF,		  "\x01",0x03,0x5E,ID_SendDTMF		  },
+	{N71_65_ReplyCallInfo,		  "\x01",0x03,0xA6,ID_IncomingFrame	  },
+	{N71_65_ReplyCallInfo,		  "\x01",0x03,0xD2,ID_IncomingFrame	  },
+	{N71_65_ReplyCallInfo,		  "\x01",0x03,0xD3,ID_IncomingFrame	  },
 
 	{N6510_ReplySendSMSMessage,	  "\x02",0x03,0x03,ID_IncomingFrame	  },
 	{N6510_ReplyIncomingSMS,	  "\x02",0x03,0x04,ID_IncomingFrame	  },
 	{N6510_ReplySetSMSC,		  "\x02",0x03,0x13,ID_SetSMSC		  },
 	{N6510_ReplyGetSMSC,		  "\x02",0x03,0x15,ID_GetSMSC		  },
 
 	{N6510_ReplyGetMemoryStatus,	  "\x03",0x03,0x04,ID_GetMemoryStatus	  },
 	{N6510_ReplyGetMemory,		  "\x03",0x03,0x08,ID_GetMemory		  },
 	{N6510_ReplyDeleteMemory,	  "\x03",0x03,0x10,ID_SetMemory		  },
 	{N71_65_ReplyWritePhonebook,	  "\x03",0x03,0x0C,ID_SetBitmap		  },
 	{N71_65_ReplyWritePhonebook,	  "\x03",0x03,0x0C,ID_SetMemory		  },
 
@@ -5499,31 +5578,33 @@ static GSM_Reply_Function N6510ReplyFunctions[] = {
 	{N71_65_ReplyDelCalendar,	  "\x13",0x03,0x0C,ID_DeleteCalendarNote  },
 	{N71_65_ReplyGetNextCalendar1,	  "\x13",0x03,0x1A,ID_GetCalendarNote	  },/*method 1*/
 	{N6510_ReplyGetCalendarNotePos,	  "\x13",0x03,0x32,ID_GetCalendarNotePos  },/*method 1*/
 	{N6510_ReplyGetCalendarInfo,	  "\x13",0x03,0x3B,ID_GetCalendarNotesInfo},/*method 1*/
 #ifdef DEBUG
 	{N71_65_ReplyGetNextCalendar2,	  "\x13",0x03,0x3F,ID_GetCalendarNote	  },
 #endif
 	{N71_65_ReplyAddCalendar2,	  "\x13",0x03,0x41,ID_SetCalendarNote	  },/*method 2*/
 	{N6510_ReplyAddCalendar3,	  "\x13",0x03,0x66,ID_SetCalendarNote	  },/*method 3*/
 	{N6510_ReplyAddToDo2,		  "\x13",0x03,0x66,ID_SetToDo		  },
 	{N6510_ReplyGetCalendar3,	  "\x13",0x03,0x7E,ID_GetCalendarNote	  },/*method 3*/
 	{N6510_ReplyGetToDo2,		  "\x13",0x03,0x7E,ID_GetToDo		  },
+	{N6510_ReplyGetNote,		  "\x13",0x03,0x7E,ID_GetNote		  },
 	{N6510_ReplyGetCalendarSettings,  "\x13",0x03,0x86,ID_GetCalendarSettings },
 	{N6510_ReplyGetLocale,		  "\x13",0x03,0x8A,ID_GetLocale		  },
 	{N6510_ReplyGetCalendarSettings,  "\x13",0x03,0x8E,ID_GetCalendarSettings },
 	{N6510_ReplyGetCalendarNotePos,	  "\x13",0x03,0x96,ID_GetCalendarNotePos  },/*method 3*/
 	{N6510_ReplyGetToDoFirstLoc2,	  "\x13",0x03,0x96,ID_SetToDo		  },
 	{N6510_ReplyGetCalendarInfo,	  "\x13",0x03,0x9F,ID_GetCalendarNotesInfo},/*method 3*/
 	{N6510_ReplyGetToDoStatus2,	  "\x13",0x03,0x9F,ID_GetToDo		  },
+	{N6510_ReplyGetNoteInfo,	  "\x13",0x03,0x9F,ID_GetNote		  },
 
 	{N6510_ReplySaveSMSMessage,	  "\x14",0x03,0x01,ID_SaveSMSMessage	  },
 	{N6510_ReplySetPicture,		  "\x14",0x03,0x01,ID_SetBitmap		  },
 	{N6510_ReplyGetSMSMessage,	  "\x14",0x03,0x03,ID_GetSMSMessage	  },
 	{N6510_ReplyDeleteSMSMessage,	  "\x14",0x03,0x05,ID_DeleteSMSMessage	  },
 	{N6510_ReplyDeleteSMSMessage,	  "\x14",0x03,0x06,ID_DeleteSMSMessage	  },
 	{N6510_ReplyGetSMSStatus,	  "\x14",0x03,0x09,ID_GetSMSStatus	  },
 	{N6510_ReplyGetSMSFolderStatus,	  "\x14",0x03,0x0d,ID_GetSMSFolderStatus  },
 	{N6510_ReplyGetSMSMessage,	  "\x14",0x03,0x0f,ID_GetSMSMessage	  },
 	{N6510_ReplyAddSMSFolder,	  "\x14",0x03,0x11,ID_AddSMSFolder	  },
 	{N6510_ReplyGetSMSFolders,	  "\x14",0x03,0x13,ID_GetSMSFolders	  },
 	{N6510_ReplySaveSMSMessage,	  "\x14",0x03,0x17,ID_SaveSMSMessage	  },
@@ -5642,25 +5723,25 @@ static GSM_Reply_Function N6510ReplyFunctions[] = {
 
 	{DCT3DCT4_ReplyGetModelFirmware,  "\xD2",0x02,0x00,ID_GetModel		  },
 	{DCT3DCT4_ReplyGetModelFirmware,  "\xD2",0x02,0x00,ID_GetFirmware	  },
 
 	/* 0xD7 - Bluetooth */
 
 	{N6510_ReplyGetRingtoneID,	  "\xDB",0x03,0x02,ID_SetRingtone	  },
 
 	{NULL,				  "\x00",0x00,0x00,ID_None		  }
 };
 
 GSM_Phone_Functions N6510Phone = {
-	"1100|1100a|1100b|3100|3100b|3108|3200|3200a|3300|3510|3510i|3530|3589i|3590|3595|5100|6100|6200|6220|6230|6310|6310i|6385|6510|6610|6800|7210|7250|7250i|7600|8310|8390|8910|8910i",
+	"1100|1100a|1100b|3100|3100b|3108|3200|3200a|3300|3510|3510i|3530|3589i|3590|3595|5100|5140|6100|6200|6220|6230|6310|6310i|6385|6510|6610|6610i|6800|6810|6820|7210|7250|7250i|7600|8310|8390|8910|8910i",
 	N6510ReplyFunctions,
 	N6510_Initialise,
 	NONEFUNCTION,			/*	Terminate 		*/
 	GSM_DispatchMessage,
 	N6510_ShowStartInfo,
 	NOKIA_GetManufacturer,
 	DCT3DCT4_GetModel,
 	DCT3DCT4_GetFirmware,
 	DCT4_GetIMEI,
 	N6510_GetOriginalIMEI,
 	N6510_GetManufactureMonth,
 	DCT4_GetProductCode,
@@ -5696,24 +5777,25 @@ GSM_Phone_Functions N6510Phone = {
 	N6510_GetSpeedDial,
 	NOTIMPLEMENTED,			/*	SetSpeedDial		*/
 	N6510_GetSMSC,
 	N6510_SetSMSC,
 	N6510_GetSMSStatus,
 	N6510_GetSMSMessage,
 	N6510_GetNextSMSMessage,
 	N6510_SetSMS,
 	N6510_AddSMS,
 	N6510_DeleteSMSMessage,
 	N6510_SendSMSMessage,
 	NOTSUPPORTED,			/*	SendSavedSMS		*/
+	NOTSUPPORTED,			/*	SetFastSMSSending	*/
 	NOKIA_SetIncomingSMS,
 	NOTIMPLEMENTED,			/* 	SetIncomingCB		*/
 	N6510_GetSMSFolders,
  	N6510_AddSMSFolder,
  	NOTIMPLEMENTED,			/* 	DeleteSMSFolder		*/
 	N6510_DialVoice,
  	N6510_AnswerCall,
  	N6510_CancelCall,
  	NOTIMPLEMENTED,			/* 	HoldCall 		*/
  	NOTIMPLEMENTED,			/* 	UnholdCall 		*/
  	NOTIMPLEMENTED,			/* 	ConferenceCall 		*/
  	NOTIMPLEMENTED,			/* 	SplitCall		*/
@@ -5750,25 +5832,25 @@ GSM_Phone_Functions N6510Phone = {
 	N6510_AddToDo,
 	N6510_DeleteToDo2,
 	N6510_DeleteAllToDo1,
 	N6510_GetCalendarStatus,
 	NOTIMPLEMENTED,			/*	GetCalendar		*/
     	N6510_GetNextCalendar,
 	NOTIMPLEMENTED,			/*	SetCalendar		*/
 	N6510_AddCalendar,
 	N71_65_DelCalendar,
 	NOTIMPLEMENTED,			/*	DeleteAllCalendar	*/
 	N6510_GetCalendarSettings,
 	NOTSUPPORTED,			/* 	SetCalendarSettings	*/
-	NOTIMPLEMENTED,			/*	GetNote			*/
+	N6510_GetNextNote,
 	N6510_GetProfile,
 	N6510_SetProfile,
     	N6510_GetFMStation,
      	N6510_SetFMStation,
  	N6510_ClearFMStations,
 	N6510_GetNextFileFolder,
 	N6510_GetFilePart,
 	N6510_AddFilePart,
 	N6510_GetFileSystemStatus,
 	N6510_DeleteFile,
 	N6510_AddFolder,
 	N6510_GetGPRSAccessPoint,
diff --git a/gammu/emb/common/phone/nokia/dct4/n6510.h b/gammu/emb/common/phone/nokia/dct4/n6510.h
index 4717aeb..26623d6 100644
--- a/gammu/emb/common/phone/nokia/dct4/n6510.h
+++ b/gammu/emb/common/phone/nokia/dct4/n6510.h
@@ -25,24 +25,26 @@ typedef struct {
 	int				LastCalendarPos;
 	GSM_NOKIACalToDoLocations	LastCalendar;
 	int				FirstCalendarPos;
 	unsigned char			CalendarIcons[10];
 	GSM_CalendarNoteType		CalendarIconsTypes[10];
 	int				CalendarIconsNum;
 
 	GSM_NOKIASMSFolder		LastSMSFolder;
 	GSM_SMSFolders			LastSMSFolders;
 
 	GSM_NOKIACalToDoLocations	LastToDo;
 
+	GSM_NOKIACalToDoLocations	LastNote;
+
 	unsigned char			RingtoneID;	/* When set with preview */
 
 	int				FilesLocations[1000];
 	int				FilesLevels[1000];
 	int				FilesLocationsUsed;
 	int				FilesLocationsCurrent;
 	int				FileToken;
 	int				ParentID;
 	int				FileCheckSum;
 
 	unsigned char			FMStatus[4000];
 	int				FMStatusLength;
diff --git a/gammu/emb/common/phone/nokia/nauto.c b/gammu/emb/common/phone/nokia/nauto.c
index bf74bc9..3bb53ec 100644
--- a/gammu/emb/common/phone/nokia/nauto.c
+++ b/gammu/emb/common/phone/nokia/nauto.c
@@ -112,25 +112,25 @@ GSM_Phone_Functions NAUTOPhone = {
 	NOTSUPPORTED,			/*	AddToDo			*/
 	NOTSUPPORTED,			/*	DeleteToDo		*/
 	NOTSUPPORTED,			/*	DeleteAllToDo		*/
 	NOTSUPPORTED,			/*	GetCalendarStatus	*/
 	NOTSUPPORTED,			/*	GetCalendar		*/
     	NOTSUPPORTED,			/*  	GetNextCalendar		*/
 	NOTSUPPORTED,			/*	SetCalendar		*/
 	NOTSUPPORTED,			/*	AddCalendar		*/
 	NOTSUPPORTED,			/*	DeleteCalendar		*/
 	NOTSUPPORTED,			/*	DeleteAllCalendar	*/
 	NOTSUPPORTED,			/* 	GetCalendarSettings	*/
 	NOTSUPPORTED,			/* 	SetCalendarSettings	*/
-	NOTSUPPORTED,			/*	GetNote			*/
+	NOTSUPPORTED,			/*	GetNextNote		*/
 	NOTSUPPORTED, 			/*	GetProfile		*/
 	NOTSUPPORTED, 			/*	SetProfile		*/
     	NOTSUPPORTED,			/*  	GetFMStation        	*/
     	NOTSUPPORTED,			/*  	SetFMStation        	*/
 	NOTSUPPORTED,			/* 	ClearFMStations		*/
 	NOTSUPPORTED,			/* 	GetNextFileFolder	*/
 	NOTSUPPORTED,			/* 	GetFilePart		*/
 	NOTSUPPORTED,			/* 	AddFilePart		*/
 	NOTSUPPORTED, 			/* 	GetFileSystemStatus	*/
 	NOTSUPPORTED,			/* 	DeleteFile		*/
 	NOTSUPPORTED,			/* 	AddFolder		*/
 	NOTSUPPORTED,			/* 	GetGPRSAccessPoint	*/
diff --git a/gammu/emb/common/phone/nokia/nfunc.c b/gammu/emb/common/phone/nokia/nfunc.c
index 3acfb10..d4d8b03 100644
--- a/gammu/emb/common/phone/nokia/nfunc.c
+++ b/gammu/emb/common/phone/nokia/nfunc.c
@@ -1384,53 +1384,67 @@ GSM_Error N71_65_ReplyCallInfo(GSM_Protocol_Message msg, GSM_StateMachine *s)
 		smprintf(s, "Call is being released\n");
 		break;
 	case 0x0b:
 		smprintf(s, "Meaning not known\n");
 		call.CallIDAvailable = false;
 		break;
 	case 0x0c:
 		smprintf(s, "Audio status\n");
 		if (msg.Buffer[4] == 0x01) smprintf(s, "Audio enabled\n");
 				      else smprintf(s, "Audio disabled\n");
 		call.CallIDAvailable = false;
 		break;
+	case 0x0f:
+	case 0x10:
+		smprintf(s, "Meaning not known\n");
+		call.CallIDAvailable = false;
+		break;
 	case 0x23:
 		smprintf(s, "Call held\n");
 		call.Status = GSM_CALL_CallHeld;
 		break;
 	case 0x25:
 		smprintf(s, "Call resumed\n");
 		call.Status = GSM_CALL_CallResumed;
 		break;
 	case 0x27:
 		smprintf(s, "Call switched\n");
 		call.Status = GSM_CALL_CallSwitched;
 		break;
 	case 0x53:
 		smprintf(s, "Outgoing call\n");
 		smprintf(s, "Call mode  : %i\n",msg.Buffer[5]);//such interpretation is in gnokii
 		tmp = 6;
 		NOKIA_GetUnicodeString(s, &tmp, msg.Buffer,buffer,false);
 		smprintf(s, "Number     : \"%s\"\n",DecodeUnicodeString(buffer));
 		/* FIXME: read name from frame */
 		call.Status = GSM_CALL_OutgoingCall;
 		tmp = 6;
 		NOKIA_GetUnicodeString(s, &tmp, msg.Buffer,call.PhoneNumber,false);
 		break;
+	case 0xA6:
+	case 0xD2:
+	case 0xD3:
+		smprintf(s, "Meaning not known\n");
+		call.CallIDAvailable = false;
+		break;
 	}
 	if (call.CallIDAvailable) smprintf(s, "Call ID    : %d\n",msg.Buffer[4]);
 	if (s->Phone.Data.EnableIncomingCall && s->User.IncomingCall!=NULL && call.Status != 0) {
 		if (call.CallIDAvailable) call.CallID = msg.Buffer[4];
 		s->User.IncomingCall(s->CurrentConfig->Device, call);
 	}
+	if (s->Phone.Data.RequestID == ID_DialVoice) {
+		if (msg.Buffer[3] == 0x10) return ERR_NOTSUPPORTED;
+	}
 	if (s->Phone.Data.RequestID == ID_CancelCall) {
 		if (msg.Buffer[3] == 0x09) {
 			if (s->Phone.Data.CallID == msg.Buffer[4]) return ERR_NONE;
 			/* when we canceled call and see frame about other
 			 * call releasing, we don't give ERR_NONE for "our"
 			 * call release command
 			 */
 			return ERR_NEEDANOTHERANSWER;
 		}
 	}
 	if (s->Phone.Data.RequestID == ID_AnswerCall) {
 		if (msg.Buffer[3] == 0x07) {
diff --git a/gammu/emb/common/phone/obex/obexgen.c b/gammu/emb/common/phone/obex/obexgen.c
index dd14f8e..3106369 100644
--- a/gammu/emb/common/phone/obex/obexgen.c
+++ b/gammu/emb/common/phone/obex/obexgen.c
@@ -765,24 +765,25 @@ GSM_Phone_Functions OBEXGENPhone = {
 	NOTIMPLEMENTED,			/*	GetSpeedDial		*/
 	NOTIMPLEMENTED,			/*	SetSpeedDial		*/
 	NOTIMPLEMENTED,			/*	GetSMSC			*/
 	NOTIMPLEMENTED,			/*	SetSMSC			*/
 	NOTIMPLEMENTED,			/*	GetSMSStatus		*/
 	NOTIMPLEMENTED,			/*	GetSMS			*/
 	NOTIMPLEMENTED,			/*	GetNextSMS		*/
 	NOTIMPLEMENTED,			/*	SetSMS			*/
 	NOTIMPLEMENTED,			/*	AddSMS			*/
 	NOTIMPLEMENTED,			/* 	DeleteSMS 		*/
 	NOTIMPLEMENTED,			/*	SendSMSMessage		*/
 	NOTSUPPORTED,			/*	SendSavedSMS		*/
+	NOTSUPPORTED,			/*	SetFastSMSSending	*/
 	NOTIMPLEMENTED,			/*	SetIncomingSMS		*/
 	NOTIMPLEMENTED,			/* 	SetIncomingCB		*/
 	NOTIMPLEMENTED,			/*	GetSMSFolders		*/
  	NOTIMPLEMENTED,			/* 	AddSMSFolder		*/
  	NOTIMPLEMENTED,			/* 	DeleteSMSFolder		*/
 	NOTIMPLEMENTED,			/*	DialVoice		*/
 	NOTIMPLEMENTED,			/*	AnswerCall		*/
 	NOTIMPLEMENTED,			/*	CancelCall		*/
  	NOTIMPLEMENTED,			/* 	HoldCall 		*/
  	NOTIMPLEMENTED,			/* 	UnholdCall 		*/
  	NOTIMPLEMENTED,			/* 	ConferenceCall 		*/
  	NOTIMPLEMENTED,			/* 	SplitCall		*/
@@ -819,25 +820,25 @@ GSM_Phone_Functions OBEXGENPhone = {
 	NOTIMPLEMENTED,			/*	AddToDo			*/
 	NOTIMPLEMENTED,			/*	DeleteToDo		*/
 	NOTIMPLEMENTED,			/*	DeleteAllToDo		*/
 	NOTIMPLEMENTED,			/*	GetCalendarStatus	*/
 	NOTIMPLEMENTED,			/*	GetCalendar		*/
     	NOTIMPLEMENTED,			/*  	GetNextCalendar		*/
 	NOTIMPLEMENTED,			/*	SetCalendar		*/
 	NOTIMPLEMENTED,			/*	AddCalendar		*/
 	NOTIMPLEMENTED,			/*	DeleteCalendar		*/
 	NOTIMPLEMENTED,			/*	DeleteAllCalendar	*/
 	NOTSUPPORTED,			/* 	GetCalendarSettings	*/
 	NOTSUPPORTED,			/* 	SetCalendarSettings	*/
-	NOTSUPPORTED,			/*	GetNote			*/
+	NOTSUPPORTED,			/*	GetNextNote		*/
 	NOTIMPLEMENTED, 		/*	GetProfile		*/
 	NOTIMPLEMENTED, 		/*	SetProfile		*/
     	NOTIMPLEMENTED,			/*  	GetFMStation        	*/
     	NOTIMPLEMENTED,			/*  	SetFMStation        	*/
     	NOTIMPLEMENTED,			/*  	ClearFMStations       	*/
 	OBEXGEN_GetNextFileFolder,
 	OBEXGEN_GetFilePart,
 	OBEXGEN_AddFilePart,
 	NOTIMPLEMENTED, 		/* 	GetFileSystemStatus	*/
 	OBEXGEN_DeleteFile,
 	OBEXGEN_AddFolder,
 	NOTIMPLEMENTED,			/* 	GetGPRSAccessPoint	*/
diff --git a/gammu/emb/common/phone/obex/obexgen.h b/gammu/emb/common/phone/obex/obexgen.h
index 466fef5..b7033de 100644
--- a/gammu/emb/common/phone/obex/obexgen.h
+++ b/gammu/emb/common/phone/obex/obexgen.h
@@ -22,17 +22,21 @@ typedef enum {
 
 typedef struct {
 	int				FileLev;
 	int				FilesLocationsUsed;
 	int				FilesLocationsCurrent;
 	GSM_File			Files[500];
 	bool				FileLastPart;
 
 	int				FrameSize;
 	OBEX_Service			Service;
 } GSM_Phone_OBEXGENData;
 
+GSM_Error OBEXGEN_GetFilePart	(GSM_StateMachine *s, GSM_File *File);
+GSM_Error OBEXGEN_AddFilePart	(GSM_StateMachine *s, GSM_File *File, int *Pos);
+GSM_Error OBEXGEN_Disconnect	(GSM_StateMachine *s);
+
 #endif
 
 /* How should editor hadle tabs in this file? Add editor commands here.
  * vim: noexpandtab sw=8 ts=8 sts=8:
  */
diff --git a/gammu/emb/common/phone/symbian/mroutgen.c b/gammu/emb/common/phone/symbian/mroutgen.c
index 2c339be..a7382cf 100644
--- a/gammu/emb/common/phone/symbian/mroutgen.c
+++ b/gammu/emb/common/phone/symbian/mroutgen.c
@@ -134,24 +134,25 @@ GSM_Phone_Functions MROUTERGENPhone = {
 	NOTSUPPORTED,			/*	GetSpeedDial		*/
 	NOTSUPPORTED,			/*	SetSpeedDial		*/
 	NOTSUPPORTED,			/*	GetSMSC			*/
 	NOTSUPPORTED,			/*	SetSMSC			*/
 	NOTSUPPORTED,			/*	GetSMSStatus		*/
 	NOTSUPPORTED,			/*	GetSMS			*/
 	NOTSUPPORTED,			/*	GetNextSMS		*/
 	NOTSUPPORTED,			/*	SetSMS			*/
 	NOTSUPPORTED,			/*	AddSMS			*/
 	NOTSUPPORTED,			/* 	DeleteSMS 		*/
 	NOTSUPPORTED,			/*	SendSMSMessage		*/
 	NOTSUPPORTED,			/*	SendSavedSMS		*/
+	NOTSUPPORTED,			/*	SetFastSMSSending	*/
 	NOTSUPPORTED,			/*	SetIncomingSMS		*/
 	NOTSUPPORTED,			/* 	SetIncomingCB		*/
 	NOTSUPPORTED,			/*	GetSMSFolders		*/
  	NOTSUPPORTED,			/* 	AddSMSFolder		*/
  	NOTSUPPORTED,			/* 	DeleteSMSFolder		*/
 	NOTSUPPORTED,			/*	DialVoice		*/
 	NOTSUPPORTED,			/*	AnswerCall		*/
 	NOTSUPPORTED,			/*	CancelCall		*/
  	NOTSUPPORTED,			/* 	HoldCall 		*/
  	NOTSUPPORTED,			/* 	UnholdCall 		*/
  	NOTSUPPORTED,			/* 	ConferenceCall 		*/
  	NOTSUPPORTED,			/* 	SplitCall		*/
@@ -188,25 +189,25 @@ GSM_Phone_Functions MROUTERGENPhone = {
 	NOTSUPPORTED,			/*	AddToDo			*/
 	NOTSUPPORTED,			/*	DeleteToDo		*/
 	NOTSUPPORTED,			/*	DeleteAllToDo		*/
 	NOTSUPPORTED,			/*	GetCalendarStatus	*/
 	NOTSUPPORTED,			/*	GetCalendar		*/
     	NOTSUPPORTED,			/*  	GetNextCalendar		*/
 	NOTSUPPORTED,			/*	SetCalendar		*/
 	NOTSUPPORTED,			/*	AddCalendar		*/
 	NOTSUPPORTED,			/*	DeleteCalendar		*/
 	NOTSUPPORTED,			/*	DeleteAllCalendar	*/
 	NOTSUPPORTED,			/* 	GetCalendarSettings	*/
 	NOTSUPPORTED,			/* 	SetCalendarSettings	*/
-	NOTSUPPORTED,			/*	GetNote			*/
+	NOTSUPPORTED,			/*	GetNextNote		*/
 	NOTSUPPORTED, 			/*	GetProfile		*/
 	NOTSUPPORTED, 			/*	SetProfile		*/
     	NOTSUPPORTED,			/*  	GetFMStation        	*/
     	NOTSUPPORTED,			/*  	SetFMStation        	*/
 	NOTSUPPORTED,			/* 	ClearFMStations		*/
 	NOTSUPPORTED,			/* 	GetNextFileFolder	*/
 	NOTSUPPORTED,			/* 	GetFilePart		*/
 	NOTSUPPORTED,			/* 	AddFilePart		*/
 	NOTSUPPORTED, 			/* 	GetFileSystemStatus	*/
 	NOTSUPPORTED,			/* 	DeleteFile		*/
 	NOTSUPPORTED,			/* 	AddFolder		*/
 	NOTSUPPORTED,			/* 	GetGPRSAccessPoint	*/
diff --git a/gammu/emb/common/protocol/at/at.c b/gammu/emb/common/protocol/at/at.c
index f4a75b7..f8ddc06 100644
--- a/gammu/emb/common/protocol/at/at.c
+++ b/gammu/emb/common/protocol/at/at.c
@@ -57,32 +57,36 @@ static GSM_Error AT_StateMachine(GSM_StateMachine *s, unsigned char rx_char)
 		"+CPIN: "	,	/*A2D issue*/
 
 		NULL};
 
 	/* Some info from phone can be inside "normal" answers
 	 * It starts with strings written here
 	 */
 	static SpecialAnswersStruct	SpecialAnswers[] = {
 		{"_OSIGQ:"	,1},	{"_OBS:"	,1},
 		{"^SCN:"	,1},	{"+CGREG:"	,1},
 		{"+CBM:"	,1},	{"+CMT:"	,2},
 		{"+CMTI:"	,1},	{"+CDS:"	,2},
-		{"+CREG:"	,1},
+		{"+CREG:"	,1},	{"+CUSD"	,1},
 		
 		{"RING"		,1},	{"NO CARRIER"	,1},
 		{"NO ANSWER"	,1},	{"+COLP"	,1},
 		{"+CLIP"	,1},
 
+		{"SDNDCRC ="	,1},	/* Samsung binary transfer end */
+
 		{NULL		,1}};
 
+//printf("%c",rx_char);
+
     	/* Ignore leading CR, LF and ESC */
     	if (d->Msg.Length == 0) {
 		if (rx_char == 10 || rx_char == 13 || rx_char == 27) return ERR_NONE;
 		d->LineStart = d->Msg.Length;
 	}
 
 	if (d->Msg.BufferUsed < d->Msg.Length + 2) {
 		d->Msg.BufferUsed	= d->Msg.Length + 2;
 		d->Msg.Buffer 		= (unsigned char *)realloc(d->Msg.Buffer,d->Msg.BufferUsed);
 	}
 	d->Msg.Buffer[d->Msg.Length++] = rx_char;
 	d->Msg.Buffer[d->Msg.Length  ] = 0;
diff --git a/gammu/emb/common/protocol/nokia/fbus2.c b/gammu/emb/common/protocol/nokia/fbus2.c
index 8b3e024..2b41f8b 100644
--- a/gammu/emb/common/protocol/nokia/fbus2.c
+++ b/gammu/emb/common/protocol/nokia/fbus2.c
@@ -1,14 +1,18 @@
 /* (c) 2002-2003 by Marcin Wiacek */
-/* based on some work from Gnokii and MyGnokii */
+/* based on some work from MyGnokii (www.mwiacek.com) */
+/* Based on some work from Gnokii (www.gnokii.org)
+ * (C) 1999-2000 Hugh Blemings & Pavel Janik ml. (C) 2001-2004 Pawel Kot 
+ * GNU GPL version 2 or later
+ */
 
 #include "../../gsmstate.h"
 
 #if defined(GSM_ENABLE_FBUS2) || defined(GSM_ENABLE_FBUS2IRDA) || defined(GSM_ENABLE_FBUS2DLR3) || defined(GSM_ENABLE_FBUS2BLUE) || defined(GSM_ENABLE_BLUEFBUS2) || defined(GSM_ENABLE_FBUS2DKU5) || defined(GSM_ENABLE_FBUS2PL2303)
 
 #include <stdio.h>
 #include <string.h>
 
 #include "../../gsmcomon.h"
 #include "fbus2.h"
 
 static GSM_Error FBUS2_WriteFrame(GSM_StateMachine 	*s,
diff --git a/gammu/emb/common/protocol/nokia/fbus2.h b/gammu/emb/common/protocol/nokia/fbus2.h
index 5dd45d7..8dbcb07 100644
--- a/gammu/emb/common/protocol/nokia/fbus2.h
+++ b/gammu/emb/common/protocol/nokia/fbus2.h
@@ -1,14 +1,18 @@
 /* (c) 2002-2003 by Marcin Wiacek */
-/* based on some work from Gnokii and MyGnokii */
+/* based on some work from MyGnokii (www.mwiacek.com) */
+/* Based on some work from Gnokii (www.gnokii.org)
+ * (C) 1999-2000 Hugh Blemings & Pavel Janik ml. (C) 2001-2004 Pawel Kot 
+ * GNU GPL version 2 or later
+ */
 
 #ifndef fbus2_h
 #define fbus2_h
 
 #include "../protocol.h"
 
 #define FBUS2_FRAME_ID       	0x1e
 #define FBUS2_IRDA_FRAME_ID    	0x1c
 #define FBUS2_DEVICE_PHONE   	0x00 /* Nokia mobile phone */
 #define FBUS2_DEVICE_PC      	0x0c /* Our PC */
 #define FBUS2_ACK_BYTE	     	0x7f /* Acknowledge of the received frame */
 
diff --git a/gammu/emb/common/protocol/nokia/mbus2.c b/gammu/emb/common/protocol/nokia/mbus2.c
index f07d6c5..8353b46 100644
--- a/gammu/emb/common/protocol/nokia/mbus2.c
+++ b/gammu/emb/common/protocol/nokia/mbus2.c
@@ -1,14 +1,14 @@
 /* (c) 2001-2003 by Marcin Wiacek */
-/* based on some work from MyGnokii */
+/* based on some work from MyGnokii (www.mwiacek.com) */
 
 #include "../../gsmstate.h"
 
 #ifdef GSM_ENABLE_MBUS2
 
 #include <stdio.h>
 #include <string.h>
 
 #include "../../gsmcomon.h"
 #include "mbus2.h"
 
 static GSM_Error MBUS2_WriteMessage (GSM_StateMachine 	*s,
diff --git a/gammu/emb/common/protocol/nokia/mbus2.h b/gammu/emb/common/protocol/nokia/mbus2.h
index 86fcab6..5dbd8cb 100644
--- a/gammu/emb/common/protocol/nokia/mbus2.h
+++ b/gammu/emb/common/protocol/nokia/mbus2.h
@@ -1,14 +1,14 @@
 /* (c) 2001-2003 by Marcin Wiacek */
-/* based on some work from MyGnokii */
+/* based on some work from MyGnokii (www.mwiacek.com) */
 
 #ifndef mbus2_h
 #define mbus2_h
 
 #include "../protocol.h"
 
 #define MBUS2_FRAME_ID       0x1f
 #define MBUS2_DEVICE_PHONE   0x00 /* Nokia mobile phone */
 #define MBUS2_DEVICE_PC      0x10 /* Our PC (MBUS) */
 #define MBUS2_ACK_BYTE	     0x7f /* Acknowledge of the received frame */
 
 typedef struct {
diff --git a/gammu/emb/common/protocol/nokia/phonet.c b/gammu/emb/common/protocol/nokia/phonet.c
index bc5717d..db5bd72 100644
--- a/gammu/emb/common/protocol/nokia/phonet.c
+++ b/gammu/emb/common/protocol/nokia/phonet.c
@@ -1,14 +1,17 @@
 /* (c) 2002-2003 by Marcin Wiacek */
-/* based on some work from Gnokii */
+/* Based on some work from Gnokii (www.gnokii.org)
+ * (C) 1999-2000 Hugh Blemings & Pavel Janik ml. (C) 2001-2004 Pawel Kot 
+ * GNU GPL version 2 or later
+ */
 
 #include "../../gsmstate.h"
 
 #if defined(GSM_ENABLE_IRDA) || defined(GSM_ENABLE_PHONETBLUE) || defined(GSM_ENABLE_BLUEPHONET)
 
 #include <stdio.h>
 #include <string.h>
 
 #include "../../gsmcomon.h"
 #include "phonet.h"
 
 static GSM_Error PHONET_WriteMessage (GSM_StateMachine 	*s,
diff --git a/gammu/emb/common/protocol/nokia/phonet.h b/gammu/emb/common/protocol/nokia/phonet.h
index 2f6e836..e750bbd 100644
--- a/gammu/emb/common/protocol/nokia/phonet.h
+++ b/gammu/emb/common/protocol/nokia/phonet.h
@@ -1,14 +1,17 @@
 /* (c) 2002-2003 by Marcin Wiacek */
-/* based on some work from Gnokii */
+/* Based on some work from Gnokii (www.gnokii.org)
+ * (C) 1999-2000 Hugh Blemings & Pavel Janik ml. (C) 2001-2004 Pawel Kot 
+ * GNU GPL version 2 or later
+ */
 
 #ifndef PHONET_h
 #define PHONET_h
 
 #include "../protocol.h"
 
 #define PHONET_FRAME_ID      	0x14
 #define PHONET_BLUE_FRAME_ID	0x19
 #define PHONET_DEVICE_PHONE   	0x00 /* Nokia mobile phone */
 #define PHONET_DEVICE_PC      	0x0c /* Our PC */
 #define PHONET_BLUE_DEVICE_PC   0x10 /* Our PC */
 
diff --git a/gammu/emb/common/service/backup/backgen.h b/gammu/emb/common/service/backup/backgen.h
index 9d7d973..9a930fc 100644
--- a/gammu/emb/common/service/backup/backgen.h
+++ b/gammu/emb/common/service/backup/backgen.h
@@ -12,46 +12,50 @@
 #include "../gsmdata.h"
 #include "../gsmprof.h"
 #include "../gsmmisc.h"
 #include "../sms/gsmsms.h"
 
 #define GSM_BACKUP_MAX_PHONEPHONEBOOK 	501
 #define GSM_BACKUP_MAX_SIMPHONEBOOK 	251
 #define GSM_BACKUP_MAX_CALLER	 	6
 #define GSM_BACKUP_MAX_SMSC		10
 #define GSM_BACKUP_MAX_WAPBOOKMARK	40
 #define GSM_BACKUP_MAX_WAPSETTINGS	30
 #define GSM_BACKUP_MAX_MMSSETTINGS	30
+#define GSM_BACKUP_MAX_SYNCMLSETTINGS	10
+#define GSM_BACKUP_MAX_CHATSETTINGS	10
 #define GSM_BACKUP_MAX_RINGTONES	30
 #define GSM_BACKUP_MAX_PROFILES		10
 #define GSM_BACKUP_MAX_FMSTATIONS	20
 #define GSM_BACKUP_MAX_GPRSPOINT	10
 #define GSM_BACKUP_MAX_NOTE		10	/* FIXME */
 
 typedef struct {
 	char			IMEI		[MAX_IMEI_LENGTH];
 	char			Model		[MAX_MODEL_LENGTH+MAX_VERSION_LENGTH];
 	char			Creator		[80];
 	GSM_DateTime		DateTime;
 	bool			DateTimeAvailable;
 	char			MD5Original	[100];
 	char			MD5Calculated	[100];
 	GSM_MemoryEntry		*PhonePhonebook	[GSM_BACKUP_MAX_PHONEPHONEBOOK + 1];
 	GSM_MemoryEntry		*SIMPhonebook	[GSM_BACKUP_MAX_SIMPHONEBOOK + 1];
 	GSM_CalendarEntry	*Calendar	[GSM_MAXCALENDARTODONOTES + 1];
 	GSM_Bitmap		*CallerLogos	[GSM_BACKUP_MAX_CALLER + 1];
 	GSM_SMSC		*SMSC		[GSM_BACKUP_MAX_SMSC + 1];
 	GSM_WAPBookmark		*WAPBookmark	[GSM_BACKUP_MAX_WAPBOOKMARK + 1];
 	GSM_MultiWAPSettings	*WAPSettings	[GSM_BACKUP_MAX_WAPSETTINGS + 1];
 	GSM_MultiWAPSettings	*MMSSettings	[GSM_BACKUP_MAX_MMSSETTINGS + 1];
+	GSM_SyncMLSettings	*SyncMLSettings [GSM_BACKUP_MAX_SYNCMLSETTINGS + 1];
+	GSM_ChatSettings	*ChatSettings 	[GSM_BACKUP_MAX_CHATSETTINGS + 1];
 	GSM_Ringtone		*Ringtone	[GSM_BACKUP_MAX_RINGTONES + 1];
 	GSM_ToDoEntry		*ToDo		[GSM_MAXCALENDARTODONOTES + 1];
 	GSM_Profile		*Profiles	[GSM_BACKUP_MAX_PROFILES + 1];
  	GSM_FMStation		*FMStation	[GSM_BACKUP_MAX_FMSTATIONS +1];
 	GSM_GPRSAccessPoint	*GPRSPoint	[GSM_BACKUP_MAX_GPRSPOINT + 1];
 	GSM_NoteEntry		*Note		[GSM_BACKUP_MAX_NOTE + 1];
 	GSM_Bitmap		*StartupLogo;
 	GSM_Bitmap		*OperatorLogo;
 } GSM_Backup;
 
 #define GSM_BACKUP_MAX_SMS	500
 
diff --git a/gammu/emb/common/service/backup/backtext.c b/gammu/emb/common/service/backup/backtext.c
index fee0f73..4cb1bb7 100644
--- a/gammu/emb/common/service/backup/backtext.c
+++ b/gammu/emb/common/service/backup/backtext.c
@@ -142,71 +142,72 @@ static void SaveBackupText(FILE *file, char *myname, char *myvalue, bool UseUnic
 
 	if (myname[0] == 0x00) {
 		if (UseUnicode) {
 			EncodeUnicode(buffer,myvalue,strlen(myvalue));
 			fwrite(buffer,1,strlen(myvalue)*2,file);
 		} else fprintf(file,"%s",myvalue);
 	} else {
 		if (UseUnicode) {
 			sprintf(buffer,"%s = \"",myname);
 			EncodeUnicode(buffer2,buffer,strlen(buffer));
 			fwrite(buffer2,1,strlen(buffer)*2,file);
 
-			fwrite(myvalue,1,UnicodeLength(myvalue)*2,file);
+			fwrite(EncodeUnicodeSpecialChars(myvalue),1,UnicodeLength(EncodeUnicodeSpecialChars(myvalue))*2,file);
 
 			sprintf(buffer,"\"%c%c",13,10);
 			EncodeUnicode(buffer2,buffer,strlen(buffer));
 			fwrite(buffer2,1,strlen(buffer)*2,file);
 		} else {
-			sprintf(buffer,"%s = \"%s\"%c%c",myname,DecodeUnicodeString(myvalue),13,10);
+			sprintf(buffer,"%s = \"%s\"%c%c",myname,EncodeSpecialChars(DecodeUnicodeString(myvalue)),13,10);
 			fprintf(file,"%s",buffer);
 
 			EncodeHexBin(buffer,myvalue,UnicodeLength(myvalue)*2);
 			fprintf(file,"%sUnicode = %s%c%c",myname,buffer,13,10);
 		}
 	}
 }
 
 static bool ReadBackupText(INI_Section *file_info, char *section, char *myname, char *myvalue, bool UseUnicode)
 {
 	unsigned char 	paramname[10000],*readvalue;
 
 	if (UseUnicode) {
 		EncodeUnicode(paramname,myname,strlen(myname));
 		readvalue = INI_GetValue(file_info, section, paramname, UseUnicode);
 		if (readvalue!=NULL) {
-			CopyUnicodeString(myvalue,readvalue+2);
-			myvalue[UnicodeLength(readvalue)*2-4]=0;
-			myvalue[UnicodeLength(readvalue)*2-3]=0;
+			CopyUnicodeString(myvalue,DecodeUnicodeSpecialChars(readvalue+2));
+			myvalue[UnicodeLength(myvalue)*2-2]=0;
+			myvalue[UnicodeLength(myvalue)*2-1]=0;
+
 			dbgprintf("%s\n",DecodeUnicodeString(readvalue));
 		} else {
 			myvalue[0]=0;
 			myvalue[1]=0;
 			return false;
 		}
 	} else {
 		strcpy(paramname,myname);
 		strcat(paramname,"Unicode");
 		readvalue = ReadCFGText(file_info, section, paramname, UseUnicode);
 		if (readvalue!=NULL) {
 			dbgprintf("%s %i\n",readvalue,strlen(readvalue));
 			DecodeHexBin (myvalue, readvalue, strlen(readvalue));
 			myvalue[strlen(readvalue)/2]=0;
 			myvalue[strlen(readvalue)/2+1]=0;
 			dbgprintf("%s\n",DecodeUnicodeString(myvalue));
 		} else {
 			strcpy(paramname,myname);
 			readvalue = ReadCFGText(file_info, section, paramname, UseUnicode);
 			if (readvalue!=NULL) {
-				EncodeUnicode(myvalue,readvalue+1,strlen(readvalue)-2);
+				EncodeUnicode(myvalue,DecodeSpecialChars(readvalue+1),strlen(DecodeSpecialChars(readvalue+1))-1);
 			} else {
 				myvalue[0]=0;
 				myvalue[1]=0;
 				return false;
 			}
 		}
 	}
 	return true;
 }
 
 static void SaveVCalDateTime(FILE *file, GSM_DateTime *dt, bool UseUnicode)
 {
@@ -409,24 +410,35 @@ static void SavePbkEntry(FILE *file, GSM_MemoryEntry *Pbk, bool UseUnicode)
 					SaveBackupText(file, "", buffer, UseUnicode);
 					i++;
 				}
 				break;
 			default:
 				break;
 		}
 	}
 	sprintf(buffer,"%c%c",13,10);
 	SaveBackupText(file, "", buffer, UseUnicode);
 }
 
+static void SaveNoteEntry(FILE *file, GSM_NoteEntry *Note, bool UseUnicode)
+{
+	char buffer[1000];
+
+	sprintf(buffer,"Location = %d%c%c", Note->Location,13,10);
+	SaveBackupText(file, "", buffer, UseUnicode);	
+	SaveBackupText(file, "Text", Note->Text, UseUnicode);
+	sprintf(buffer, "%c%c",13,10);
+	SaveBackupText(file, "", buffer, UseUnicode);
+}
+
 static void SaveCalendarEntry(FILE *file, GSM_CalendarEntry *Note, bool UseUnicode)
 {
 	int 	i;
 	char	buffer[1000];
 
 	sprintf(buffer,"Location = %d%c%c", Note->Location,13,10);
 	SaveBackupText(file, "", buffer, UseUnicode);	
 	SaveBackupText(file, "", "Type = ", UseUnicode);
 	switch (Note->Type) {
 		case GSM_CAL_REMINDER 	: sprintf(buffer,"Reminder%c%c", 		13,10); break;
 		case GSM_CAL_CALL     	: sprintf(buffer,"Call%c%c", 			13,10); break;
 		case GSM_CAL_MEETING  	: sprintf(buffer,"Meeting%c%c", 		13,10); break;
@@ -648,24 +660,66 @@ static void SaveWAPSettingsEntry(FILE *file, GSM_MultiWAPSettings *settings, boo
 				if (settings->Settings[i].IsIP) {
 					sprintf(buffer,"IP%02i",i);
 				} else {
 					sprintf(buffer,"Number%02i",i);
 				}
 				SaveBackupText(file, buffer, settings->Settings[i].Service, UseUnicode);
 		}
 		sprintf(buffer,"%c%c",13,10);
 		SaveBackupText(file, "", buffer, UseUnicode);
 	}
 }
 
+static void SaveChatSettingsEntry(FILE *file, GSM_ChatSettings *settings, bool UseUnicode)
+{
+	char buffer[10000];
+
+	sprintf(buffer,"HomePage");
+	SaveBackupText(file, buffer, settings->HomePage, UseUnicode);
+	sprintf(buffer,"User");
+	SaveBackupText(file, buffer, settings->User, UseUnicode);
+	sprintf(buffer,"Password");
+	SaveBackupText(file, buffer, settings->Password, UseUnicode);
+	SaveWAPSettingsEntry(file, &settings->Connection, UseUnicode);
+}
+
+static void SaveSyncMLSettingsEntry(FILE *file, GSM_SyncMLSettings *settings, bool UseUnicode)
+{
+	char buffer[10000];
+
+	sprintf(buffer,"User");
+	SaveBackupText(file, buffer, settings->User, UseUnicode);
+	sprintf(buffer,"Password");
+	SaveBackupText(file, buffer, settings->Password, UseUnicode);
+	sprintf(buffer,"PhonebookDB");
+	SaveBackupText(file, buffer, settings->PhonebookDataBase, UseUnicode);
+	sprintf(buffer,"CalendarDB");
+	SaveBackupText(file, buffer, settings->CalendarDataBase, UseUnicode);
+	sprintf(buffer,"Server");
+	SaveBackupText(file, buffer, settings->Server, UseUnicode);
+	if (settings->SyncPhonebook) {
+		sprintf(buffer,"SyncPhonebook = True%c%c",13,10);
+	} else {
+		sprintf(buffer,"SyncPhonebook = False%c%c",13,10);
+	}
+	SaveBackupText(file, "", buffer, UseUnicode);
+	if (settings->SyncCalendar) {
+		sprintf(buffer,"SyncCalendar = True%c%c",13,10);
+	} else {
+		sprintf(buffer,"SyncCalendar = False%c%c",13,10);
+	}
+	SaveBackupText(file, "", buffer, UseUnicode);
+	SaveWAPSettingsEntry(file, &settings->Connection, UseUnicode);
+}
+
 static void SaveBitmapEntry(FILE *file, GSM_Bitmap *bitmap, bool UseUnicode)
 {
 	unsigned char 	buffer[10000],buffer2[10000];
 	int		x,y;
 
 	sprintf(buffer,"Width = %i%c%c",bitmap->BitmapWidth,13,10);
 	SaveBackupText(file, "", buffer, UseUnicode);
 	sprintf(buffer,"Height = %i%c%c",bitmap->BitmapHeight,13,10);
 	SaveBackupText(file, "", buffer, UseUnicode);
 	for (y=0;y<bitmap->BitmapHeight;y++) {
 		for (x=0;x<bitmap->BitmapWidth;x++) {
 			buffer[x] = ' ';
@@ -756,40 +810,41 @@ static void SaveSMSCEntry(FILE *file, GSM_SMSC *SMSC, bool UseUnicode)
 		case SMS_VALID_1_Week  	: sprintf(buffer, "1week"	); break;
 		case SMS_VALID_Max_Time	:
 		default			: sprintf(buffer,"MaximumTime"	); break;
 	}
 	SaveBackupText(file, "", buffer, UseUnicode);
 	sprintf(buffer,"%c%c%c%c",13,10,13,10);
 	SaveBackupText(file, "", buffer, UseUnicode);
 }
 
 static void SaveRingtoneEntry(FILE *file, GSM_Ringtone *ringtone, bool UseUnicode)
 {
 	unsigned char 	buffer[45000];
-	int		i,j;
 
 	sprintf(buffer,"Location = %i%c%c",ringtone->Location,13,10);
 	SaveBackupText(file, "", buffer, UseUnicode);
 	SaveBackupText(file, "Name", ringtone->Name, UseUnicode);
 	switch (ringtone->Format) {
 	case RING_NOKIABINARY:
-		j = 0; i = 0;
 		EncodeHexBin(buffer,ringtone->NokiaBinary.Frame,ringtone->NokiaBinary.Length);
 		SaveLinkedBackupText(file, "NokiaBinary", buffer, UseUnicode);
 		break;
 	case RING_MIDI:
-		j = 0; i = 0;
 		EncodeHexBin(buffer,ringtone->NokiaBinary.Frame,ringtone->NokiaBinary.Length);
 		SaveLinkedBackupText(file, "Pure Midi", buffer, UseUnicode);
 		break;
+	case RING_MMF:
+		EncodeHexBin(buffer,ringtone->NokiaBinary.Frame,ringtone->NokiaBinary.Length);
+		SaveLinkedBackupText(file, "SMAF", buffer, UseUnicode);
+		break;
 	case RING_NOTETONE:
 		break;
 	}
 	sprintf(buffer,"%c%c",13,10);
 	SaveBackupText(file, "", buffer, UseUnicode);
 }
 
 static void SaveOperatorEntry(FILE *file, GSM_Bitmap *bitmap, bool UseUnicode)
 {
 	unsigned char buffer[1000];
 
 	sprintf(buffer,"[Operator]%c%c",13,10);
@@ -1066,24 +1121,31 @@ GSM_Error SaveBackup(char *FileName, GSM_Backup *backup, bool UseUnicode)
 		SaveBackupText(file, "", buffer, UseUnicode);
 		SavePbkEntry(file, backup->SIMPhonebook[i], UseUnicode);
 		i++;
 	}
 	i=0;
 	while (backup->Calendar[i]!=NULL) {
 		sprintf(buffer,"[Calendar%03i]%c%c",i+1,13,10);
 		SaveBackupText(file, "", buffer, UseUnicode);
 		SaveCalendarEntry(file, backup->Calendar[i], UseUnicode);
 		i++;
 	}
 	i=0;
+	while (backup->Note[i]!=NULL) {
+		sprintf(buffer,"[Note%03i]%c%c",i+1,13,10);
+		SaveBackupText(file, "", buffer, UseUnicode);
+		SaveNoteEntry(file, backup->Note[i], UseUnicode);
+		i++;
+	}
+	i=0;
 	while (backup->CallerLogos[i]!=NULL) {
 		sprintf(buffer,"[Caller%03i]%c%c",i+1,13,10);
 		SaveBackupText(file, "", buffer, UseUnicode);
 		SaveCallerEntry(file, backup->CallerLogos[i], UseUnicode);
 		i++;
 	}
 	i=0;
 	while (backup->SMSC[i]!=NULL) {
 		sprintf(buffer,"[SMSC%03i]%c%c",i+1,13,10);
 		SaveBackupText(file, "", buffer, UseUnicode);
 		SaveSMSCEntry(file, backup->SMSC[i], UseUnicode);
 		i++;
@@ -1101,24 +1163,38 @@ GSM_Error SaveBackup(char *FileName, GSM_Backup *backup, bool UseUnicode)
 		SaveBackupText(file, "", buffer, UseUnicode);
 		SaveWAPSettingsEntry(file, backup->WAPSettings[i], UseUnicode);
 		i++;
 	}
 	i=0;
 	while (backup->MMSSettings[i]!=NULL) {
 		sprintf(buffer,"[MMSSettings%03i]%c%c",i+1,13,10);
 		SaveBackupText(file, "", buffer, UseUnicode);
 		SaveWAPSettingsEntry(file, backup->MMSSettings[i], UseUnicode);
 		i++;
 	}
 	i=0;
+	while (backup->SyncMLSettings[i]!=NULL) {
+		sprintf(buffer,"[SyncMLSettings%03i]%c%c",i+1,13,10);
+		SaveBackupText(file, "", buffer, UseUnicode);
+		SaveSyncMLSettingsEntry(file, backup->SyncMLSettings[i], UseUnicode);
+		i++;
+	}
+	i=0;
+	while (backup->ChatSettings[i]!=NULL) {
+		sprintf(buffer,"[ChatSettings%03i]%c%c",i+1,13,10);
+		SaveBackupText(file, "", buffer, UseUnicode);
+		SaveChatSettingsEntry(file, backup->ChatSettings[i], UseUnicode);
+		i++;
+	}
+	i=0;
 	while (backup->Ringtone[i]!=NULL) {
 		sprintf(buffer,"[Ringtone%03i]%c%c",i+1,13,10);
 		SaveBackupText(file, "", buffer, UseUnicode);
 		SaveRingtoneEntry(file, backup->Ringtone[i], UseUnicode);
 		i++;
 	}
 	i=0;
 	while (backup->ToDo[i]!=NULL) {
 		sprintf(buffer,"[TODO%03i]%c%c",i+1,13,10);
 		SaveBackupText(file, "", buffer, UseUnicode);
 		SaveToDoEntry(file, backup->ToDo[i], UseUnicode);
 		i++;
@@ -2647,25 +2723,150 @@ GSM_Error LoadBackup(char *FileName, GSM_Backup *backup, bool UseUnicode)
 				backup->Note[num + 1] = NULL;
 			} else {
 				dbgprintf("Increase GSM_BACKUP_MAX_NOTE\n");
 				return ERR_MOREMEMORY;
 			}
 			ReadNoteEntry(file_info, h->SectionName, backup->Note[num],UseUnicode);
 			num++;
                 }
         }
 	if (backup->MD5Original[0]!=0) {
 		FindBackupChecksum(FileName, UseUnicode, backup->MD5Calculated);
 	}
-
+        for (h = file_info; h != NULL; h = h->Next) {
+		found = false;
+		if (UseUnicode) {
+			EncodeUnicode(buffer,"Backup",4);
+			if (mywstrncasecmp(buffer, h->SectionName, 6)) found = true;
+		} else {
+	                if (mystrncasecmp("Backup", h->SectionName, 6)) found = true;
+		}
+		if (UseUnicode) {
+			EncodeUnicode(buffer,"Checksum",4);
+			if (mywstrncasecmp(buffer, h->SectionName, 8)) found = true;
+		} else {
+	                if (mystrncasecmp("Checksum", h->SectionName, 8)) found = true;
+		}
+		if (UseUnicode) {
+			EncodeUnicode(buffer,"Profile",7);
+			if (mywstrncasecmp(buffer, h->SectionName, 7)) found = true;
+		} else {
+	                if (mystrncasecmp("Profile", h->SectionName, 7)) found = true;
+		}
+		if (UseUnicode) {
+			EncodeUnicode(buffer,"PhonePBK",8);
+			if (mywstrncasecmp(buffer, h->SectionName, 8)) found = true;
+		} else {
+	                if (mystrncasecmp("PhonePBK", h->SectionName, 8)) found = true;
+		}
+		if (UseUnicode) {
+			EncodeUnicode(buffer,"SIMPBK",6);
+			if (mywstrncasecmp(buffer, h->SectionName, 6)) found = true;
+		} else {
+	                if (mystrncasecmp("SIMPBK", h->SectionName, 6)) found = true;
+		}
+		if (UseUnicode) {
+			EncodeUnicode(buffer,"Calendar",8);
+			if (mywstrncasecmp(buffer, h->SectionName, 8)) found = true;
+		} else {
+	                if (mystrncasecmp("Calendar", h->SectionName, 8)) found = true;
+		}
+		if (UseUnicode) {
+			EncodeUnicode(buffer,"Caller",6);
+			if (mywstrncasecmp(buffer, h->SectionName, 6)) found = true;
+		} else {
+	                if (mystrncasecmp("Caller", h->SectionName, 6)) found = true;
+		}
+		if (UseUnicode) {
+			EncodeUnicode(buffer,"SMSC",4);
+			if (mywstrncasecmp(buffer, h->SectionName, 4)) found = true;
+		} else {
+	                if (mystrncasecmp("SMSC", h->SectionName, 4)) found = true;
+		}
+		if (UseUnicode) {
+			EncodeUnicode(buffer,"WAPBookmark",11);
+			if (mywstrncasecmp(buffer, h->SectionName, 11)) found = true;
+			if (!found) {
+				EncodeUnicode(buffer,"Bookmark",8);
+				if (mywstrncasecmp(buffer, h->SectionName, 8)) found = true;
+			}
+		} else {
+	                if (mystrncasecmp("WAPBookmark", h->SectionName, 11)) found = true;
+			if (!found) {
+				if (mystrncasecmp("Bookmark", h->SectionName, 8)) found = true;
+			}
+		}
+		if (UseUnicode) {
+			EncodeUnicode(buffer,"WAPSettings",11);
+			if (mywstrncasecmp(buffer, h->SectionName, 11)) found = true;
+			if (!found) {
+				EncodeUnicode(buffer,"Settings",8);
+				if (mywstrncasecmp(buffer, h->SectionName, 8)) found = true;
+			}
+		} else {
+	                if (mystrncasecmp("WAPSettings", h->SectionName, 11)) found = true;
+			if (!found) {
+		                if (mystrncasecmp("Settings", h->SectionName, 8)) found = true;
+			}
+		}
+		if (UseUnicode) {
+			EncodeUnicode(buffer,"MMSSettings",8);
+			if (mywstrncasecmp(buffer, h->SectionName, 8)) found = true;
+		} else {
+	                if (mystrncasecmp("MMSSettings", h->SectionName, 8)) found = true;
+		}
+		if (UseUnicode) {
+			EncodeUnicode(buffer,"Ringtone",8);
+			if (mywstrncasecmp(buffer, h->SectionName, 8)) found = true;
+		} else {
+	                if (mystrncasecmp("Ringtone", h->SectionName, 8)) found = true;
+		}
+		if (UseUnicode) {
+			EncodeUnicode(buffer,"TODO",4);
+			if (mywstrncasecmp(buffer, h->SectionName, 4)) found = true;
+		} else {
+	                if (mystrncasecmp("TODO", h->SectionName, 4)) found = true;
+		}
+		if (UseUnicode) {
+			EncodeUnicode(buffer,"Startup",7);
+			if (mywstrncasecmp(buffer, h->SectionName, 7)) found = true;
+		} else {
+	                if (mystrncasecmp("Startup", h->SectionName, 7)) found = true;
+		}
+		if (UseUnicode) {
+			EncodeUnicode(buffer,"Operator",7);
+			if (mywstrncasecmp(buffer, h->SectionName, 8)) found = true;
+		} else {
+	                if (mystrncasecmp("Operator", h->SectionName, 8)) found = true;
+		}
+		if (UseUnicode) {
+			EncodeUnicode(buffer,"FMStation",9);
+			if (mywstrncasecmp(buffer, h->SectionName, 9)) found = true;
+		} else {
+	                if (mystrncasecmp("FMStation", h->SectionName, 9)) found = true;
+		}
+		if (UseUnicode) {
+			EncodeUnicode(buffer,"GPRSPoint",9);
+			if (mywstrncasecmp(buffer, h->SectionName, 9)) found = true;
+		} else {
+	                if (mystrncasecmp("GPRSPoint", h->SectionName, 9)) found = true;
+		}
+		if (UseUnicode) {
+			EncodeUnicode(buffer,"Note",4);
+			if (mywstrncasecmp(buffer, h->SectionName, 4)) found = true;
+		} else {
+	                if (mystrncasecmp("Note", h->SectionName, 4)) found = true;
+		}
+		if (!found) return ERR_NOTIMPLEMENTED;
+        }
 	return ERR_NONE;
 }
 
 /* ---------------------- backup files for SMS ----------------------------- */
 
 static void ReadSMSBackupEntry(INI_Section *file_info, char *section, GSM_SMSMessage *SMS)
 {
 	unsigned char buffer[10000], *readvalue;
 
 	GSM_SetDefaultSMSData(SMS);
 
 	SMS->PDU = SMS_Submit;
diff --git a/gammu/emb/common/service/backup/gsmback.c b/gammu/emb/common/service/backup/gsmback.c
index 91ac745..c94a4d2 100644
--- a/gammu/emb/common/service/backup/gsmback.c
+++ b/gammu/emb/common/service/backup/gsmback.c
@@ -64,24 +64,36 @@ void GSM_FreeBackup(GSM_Backup *backup)
 	while (backup->WAPSettings[i]!=NULL) {
 		free(backup->WAPSettings[i]);
 		backup->WAPSettings[i] = NULL;
 		i++;
 	}
 	i=0;
 	while (backup->MMSSettings[i]!=NULL) {
 		free(backup->MMSSettings[i]);
 		backup->MMSSettings[i] = NULL;
 		i++;
 	}
 	i=0;
+	while (backup->SyncMLSettings[i]!=NULL) {
+		free(backup->SyncMLSettings[i]);
+		backup->SyncMLSettings[i] = NULL;
+		i++;
+	}
+	i=0;
+	while (backup->ChatSettings[i]!=NULL) {
+		free(backup->ChatSettings[i]);
+		backup->ChatSettings[i] = NULL;
+		i++;
+	}
+	i=0;
 	while (backup->Ringtone[i]!=NULL) {
 		free(backup->Ringtone[i]);
 		backup->Ringtone[i] = NULL;
 		i++;
 	}
 	i=0;
 	while (backup->ToDo[i]!=NULL) {
 		free(backup->ToDo[i]);
 		backup->ToDo[i] = NULL;
 		i++;
 	}
 	i=0;
@@ -111,81 +123,83 @@ void GSM_FreeBackup(GSM_Backup *backup)
 		i++;
 	}
 	i=0;
 	while (backup->Note[i]!=NULL) {
 		free(backup->Note[i]);
 		backup->Note[i] = NULL;
 		i++;
 	}
 }
 
 GSM_Error GSM_SaveBackupFile(char *FileName, GSM_Backup *backup, bool UseUnicode)
 {
-	if (strstr(FileName,".lmb")) {
+	if (mystrcasestr(FileName,".lmb")) {
 		return SaveLMB(FileName,backup);
-	} else if (strstr(FileName,".vcs")) {
+	} else if (mystrcasestr(FileName,".vcs")) {
 		return SaveVCalendar(FileName,backup);
-	} else if (strstr(FileName,".vcf")) {
+	} else if (mystrcasestr(FileName,".vcf")) {
 		return SaveVCard(FileName,backup);
-	} else if (strstr(FileName,".ldif")) {
+	} else if (mystrcasestr(FileName,".ldif")) {
 		return SaveLDIF(FileName,backup);
-	} else if (strstr(FileName,".ics")) {
+	} else if (mystrcasestr(FileName,".ics")) {
 		return SaveICS(FileName,backup);
 	} else {
 		return SaveBackup(FileName,backup, UseUnicode);
 	}
 }
 
 GSM_Error GSM_ReadBackupFile(char *FileName, GSM_Backup *backup)
 {
 	FILE		*file;
 	unsigned char	buffer[300];
 
 	file = fopen(FileName, "rb");
 	if (file == NULL) return ERR_CANTOPENFILE;
 	fread(buffer, 1, 9, file); /* Read the header of the file. */
 	fclose(file);
 
 	GSM_ClearBackup(backup);
 
 	/* Attempt to identify filetype */
-	if (strstr(FileName,".vcs")) {
+	if (mystrcasestr(FileName,".vcs")) {
 		return LoadVCalendar(FileName,backup);
-	} else if (strstr(FileName,".vcf")) {
+	} else if (mystrcasestr(FileName,".vcf")) {
 		return LoadVCard(FileName,backup);
-	} else if (strstr(FileName,".ldif")) {
+	} else if (mystrcasestr(FileName,".ldif")) {
 		return LoadLDIF(FileName,backup);
-	} else if (strstr(FileName,".ics")) {
+	} else if (mystrcasestr(FileName,".ics")) {
 		return LoadICS(FileName,backup);
 	} else if (memcmp(buffer, "LMB ",4)==0) {
 		return LoadLMB(FileName,backup);
 	} else if (buffer[0] == 0xFE && buffer[1] == 0xFF) {
 		return LoadBackup(FileName,backup,true);
 	} else if (buffer[0] == 0xFF && buffer[1] == 0xFE) {
 		return LoadBackup(FileName,backup,true);
 	} else {
 		return LoadBackup(FileName,backup,false);
 	}
 }
 
 void GSM_ClearBackup(GSM_Backup *backup)
 {
 	backup->PhonePhonebook	[0] = NULL;
 	backup->SIMPhonebook	[0] = NULL;
 	backup->Calendar	[0] = NULL;
 	backup->CallerLogos	[0] = NULL;
 	backup->SMSC		[0] = NULL;
 	backup->WAPBookmark	[0] = NULL;
 	backup->WAPSettings	[0] = NULL;
 	backup->MMSSettings	[0] = NULL;
+	backup->SyncMLSettings	[0] = NULL;
+	backup->ChatSettings	[0] = NULL;
 	backup->Ringtone	[0] = NULL;
 	backup->Profiles	[0] = NULL;
 	backup->ToDo		[0] = NULL;
 	backup->GPRSPoint	[0] = NULL;
 	backup->FMStation	[0] = NULL;
 	backup->Note		[0] = NULL;
 	backup->StartupLogo	    = NULL;
 	backup->OperatorLogo	    = NULL;
 
 	backup->Creator		[0] = 0;
 	backup->IMEI		[0] = 0;
 	backup->Model		[0] = 0;
@@ -200,24 +214,26 @@ void GSM_GetBackupFormatFeatures(char *FileName, GSM_Backup_Info *info)
 	info->IMEI 		= false;
 	info->Model 		= false;
 	info->DateTime 		= false;
 	info->PhonePhonebook 	= false;
 	info->SIMPhonebook 	= false;
 	info->ToDo		= false;
 	info->Calendar 		= false;
 	info->CallerLogos 	= false;
 	info->SMSC 		= false;
 	info->WAPBookmark 	= false;
 	info->WAPSettings 	= false;
 	info->MMSSettings 	= false;
+	info->SyncMLSettings 	= false;
+	info->ChatSettings 	= false;
 	info->Ringtone 		= false;
 	info->StartupLogo 	= false;
 	info->OperatorLogo 	= false;
 	info->Profiles 		= false;
 	info->FMStation 	= false;
 	info->GPRSPoint		= false;
 	info->Note		= false;
 
 	if (strstr(FileName,".lmb")) {
 		info->PhonePhonebook 	= true;
 		info->SIMPhonebook 	= true;
 		info->CallerLogos 	= true;
@@ -237,24 +253,26 @@ void GSM_GetBackupFormatFeatures(char *FileName, GSM_Backup_Info *info)
 		info->IMEI 		= true;
 		info->Model 		= true;
 		info->DateTime 		= true;
 		info->PhonePhonebook 	= true;
 		info->SIMPhonebook 	= true;
 		info->ToDo		= true;
 		info->Calendar 		= true;
 		info->CallerLogos 	= true;
 		info->SMSC 		= true;
 		info->WAPBookmark 	= true;
 		info->WAPSettings 	= true;
 		info->MMSSettings 	= true;
+		info->SyncMLSettings 	= true;
+		info->ChatSettings 	= true;
 		info->Ringtone 		= true;
 		info->StartupLogo 	= true;
 		info->OperatorLogo 	= true;
 		info->Profiles 		= true;
  		info->FMStation 	= true;
 		info->GPRSPoint		= true;
 		info->Note		= true;
 	}
 }
 
 void GSM_GetBackupFileFeatures(char *FileName, GSM_Backup_Info *info, GSM_Backup *backup)
 {
diff --git a/gammu/emb/common/service/backup/gsmback.h b/gammu/emb/common/service/backup/gsmback.h
index 1fd99b0..791e81d 100644
--- a/gammu/emb/common/service/backup/gsmback.h
+++ b/gammu/emb/common/service/backup/gsmback.h
@@ -20,24 +20,26 @@ typedef struct {
 	bool Model;
 	bool DateTime;
 	bool ToDo;
 	bool PhonePhonebook;
 	bool SIMPhonebook;
 	bool Calendar;
 	bool CallerLogos;
 	bool SMSC;
 	bool WAPBookmark;
 	bool Profiles;
 	bool WAPSettings;
 	bool MMSSettings;
+	bool SyncMLSettings;
+	bool ChatSettings;
 	bool Ringtone;
 	bool StartupLogo;
 	bool OperatorLogo;
  	bool FMStation;
 	bool GPRSPoint;
 	bool Note;
 } GSM_Backup_Info;
 
 void GSM_GetBackupFormatFeatures(char *FileName, GSM_Backup_Info *info);
 void GSM_GetBackupFileFeatures  (char *FileName, GSM_Backup_Info *info, GSM_Backup *backup);
 
 #endif
diff --git a/gammu/emb/common/service/gsmcal.h b/gammu/emb/common/service/gsmcal.h
index 067a4a4..0a41b7b 100644
--- a/gammu/emb/common/service/gsmcal.h
+++ b/gammu/emb/common/service/gsmcal.h
@@ -396,25 +396,25 @@ GSM_Error GSM_EncodeVTODO(char *Buffer, int *Length, GSM_ToDoEntry *note, bool h
  */
 typedef struct {
 	/**
 	 * Number of used positions.
 	 */
 	int	     Used;
 } GSM_ToDoStatus;
 
 /* --------------------------- note ---------------------------------------- */
 
 typedef struct {
 	int	     Location;
-	char	     Text[100];
+	char	     Text[3000*2];
 } GSM_NoteEntry;
 
 GSM_Error GSM_EncodeVNTFile(unsigned char *Buffer, int *Length, GSM_NoteEntry *Note);
 
 /* --------------------------- alarm --------------------------------------- */
 
 /**
  * Alarm values.
  */
 typedef struct {
 	/**
 	 * Location where it is stored.
diff --git a/gammu/emb/common/service/gsmdata.c b/gammu/emb/common/service/gsmdata.c
index 94e9b7b..9303b57 100644
--- a/gammu/emb/common/service/gsmdata.c
+++ b/gammu/emb/common/service/gsmdata.c
@@ -237,71 +237,149 @@ void NOKIA_EncodeWAPMMSSettingsSMSText(unsigned char *Buffer, int *Length, GSM_W
 
 		/* ISP_NAME (name) */
 		Buffer[(*Length)++] = 0xC6; 		//CHARACTERISTIC with content and attributes
 		Buffer[(*Length)++] = 0x08; 		//TYPE=NAME
 		Buffer[(*Length)++] = 0x01; 		//END PARMeter
 			/* Settings name */
 			AddWAPSMSParameterText(Buffer, Length, 0x15, DecodeUnicodeString(settings->Title), UnicodeLength(settings->Title));
 		Buffer[(*Length)++] = 0x01; 		//END PARMeter
 	Buffer[(*Length)++] = 0x01;			//END PARMeter
 }
 
 /* http://forum.nokia.com: OTA Settings 7.0 */
+/* first it used default/ISO coding */
+/* Joergen Thomsen changed to UTF8 */
 void NOKIA_EncodeWAPBookmarkSMSText(unsigned char *Buffer, int *Length, GSM_WAPBookmark *bookmark)
 {
 	unsigned char	buffer[100];
-	bool		UnicodeCoding = false;
 
-	EncodeUTF8QuotedPrintable(buffer,bookmark->Title);
-	if (UnicodeLength(bookmark->Title)!=strlen(buffer)) UnicodeCoding = true;
+//	bool		UnicodeCoding = false;
+//	EncodeUTF8QuotedPrintable(buffer,bookmark->Title);
+//	if (UnicodeLength(bookmark->Title)!=strlen(buffer)) UnicodeCoding = true;
 
 	Buffer[(*Length)++] = 0x01; 			//Push ID
 	Buffer[(*Length)++] = 0x06; 			//PDU Type (push)
 	Buffer[(*Length)++] = 0x2D; 			//Headers length (content type + headers)
 	strcpy(Buffer+(*Length),"\x1F\x2B");
 	(*Length)=(*Length)+2;				//Value length
 	strcpy(Buffer+(*Length),"application/x-wap-prov.browser-bookmarks");
 	(*Length)=(*Length)+40;				//MIME-Type
 	Buffer[(*Length)++] = 0x00; 			//end inline string
 	strcpy(Buffer+(*Length),"\x81\xEA");
 	(*Length)=(*Length)+2;				//charset UTF-8 short int.
 
+	/* removed by Joergen Thomsen */
 	/* Block from sniffs. UNKNOWN */
-	if (!UnicodeCoding) {
-		Buffer[(*Length)++] = 0x00;
-		Buffer[(*Length)++] = 0x01;
-	} else {
-		strcpy(Buffer+(*Length),"\x01\x01\x87\x68");
-		(*Length)=(*Length)+4;
-	}
-	Buffer[(*Length)++] = 0x00;
+//	if (!UnicodeCoding) {
+//		Buffer[(*Length)++] = 0x00;
+//		Buffer[(*Length)++] = 0x01;
+//	} else {
+//		strcpy(Buffer+(*Length),"\x01\x01\x87\x68");
+//		(*Length)=(*Length)+4;
+//	}
+//	Buffer[(*Length)++] = 0x00;
+
+	/* added by Joergen Thomsen */
+	Buffer[(*Length)++] = 0x01;			// Version WBXML 1.1
+	Buffer[(*Length)++] = 0x01;			// Unknown public identifier
+	Buffer[(*Length)++] = 0x6A;			// charset UTF-8
+	Buffer[(*Length)++] = 0x00;			// string table length
 
 	Buffer[(*Length)++] = 0x45; 			//CHARACTERISTIC-LIST with content
 		/* URL */
 		Buffer[(*Length)++] = 0xC6; 		//CHARACTERISTIC with content and attributes
 		Buffer[(*Length)++] = 0x7F;             //TYPE = BOOKMARK
 		Buffer[(*Length)++] = 0x01; 		//END PARMeter
-			if (!UnicodeCoding) {
-				/* TITLE */
-				AddWAPSMSParameterText(Buffer, Length, 0x15, DecodeUnicodeString(bookmark->Title), UnicodeLength(bookmark->Title));
-				/* URL */
-				AddWAPSMSParameterText(Buffer, Length, 0x17, DecodeUnicodeString(bookmark->Address), UnicodeLength(bookmark->Address));
-			} else {
+
+			/* removed by Joergen Thomsen */
+//			if (!UnicodeCoding) {
+//				/* TITLE */
+//				AddWAPSMSParameterText(Buffer, Length, 0x15, DecodeUnicodeString(bookmark->Title), UnicodeLength(bookmark->Title));
+//				/* URL */
+//				AddWAPSMSParameterText(Buffer, Length, 0x17, DecodeUnicodeString(bookmark->Address), UnicodeLength(bookmark->Address));
+//			} else {
+//				/* TITLE */
+//				AddWAPSMSParameterText(Buffer, Length, 0x15, bookmark->Title, UnicodeLength(bookmark->Title)*2+1);
+//				/* URL */
+//				AddWAPSMSParameterText(Buffer, Length, 0x17, bookmark->Address, UnicodeLength(bookmark->Address)*2+1);
+//			}
+
+			/* added by Joergen Thomsen */
 				/* TITLE */
-				AddWAPSMSParameterText(Buffer, Length, 0x15, bookmark->Title, UnicodeLength(bookmark->Title)*2+1);
+			EncodeUTF8(buffer, bookmark->Title);
+			AddWAPSMSParameterText(Buffer, Length, 0x15, buffer, strlen(buffer));
 				/* URL */
-				AddWAPSMSParameterText(Buffer, Length, 0x17, bookmark->Address, UnicodeLength(bookmark->Address)*2+1);
+			EncodeUTF8(buffer, bookmark->Address);
+			AddWAPSMSParameterText(Buffer, Length, 0x17, buffer, strlen(buffer));
+
+		Buffer[(*Length)++] = 0x01;		//END (CHARACTERISTIC)
+	Buffer[(*Length)++] = 0x01;			//END (CHARACTERISTIC-LIST)
 			}
-		Buffer[(*Length)++] = 0x01;		//END PARMeter
-	Buffer[(*Length)++] = 0x01;			//END PARMeter
+
+void GSM_EncodeWAPIndicatorSMSText(unsigned char *Buffer, int *Length, char *Text, char *URL)
+{
+	int i;
+
+	Buffer[(*Length)++] = 0x01; 			//Push ID
+	Buffer[(*Length)++] = 0x06; 			//PDU Type (push)
+	Buffer[(*Length)++] = 28; 			//Headers length (content type + headers)
+	strcpy(Buffer+(*Length),"\x1F\x23");
+	(*Length)=(*Length)+2;				//Value length
+	strcpy(Buffer+(*Length),"application/vnd.wap.sic");
+	(*Length)=(*Length)+23;				//MIME-Type
+	Buffer[(*Length)++] = 0x00; 			//end inline string
+	strcpy(Buffer+(*Length),"\x81\xEA");
+	(*Length)=(*Length)+2;				//charset UTF-8 short int.
+
+	Buffer[(*Length)++] = 0x02; 			// WBXML 1.2
+	Buffer[(*Length)++] = 0x05; 			// SI 1.0 Public Identifier
+	Buffer[(*Length)++] = 0x6A;			// charset UTF-8
+	Buffer[(*Length)++] = 0x00;			// string table length
+	Buffer[(*Length)++] = 0x45;			// SI with content
+		Buffer[(*Length)++] = 0xC6;		// indication with content and attributes
+			Buffer[(*Length)++] = 0x0B;	// address
+			Buffer[(*Length)++] = 0x03; 	// Inline string
+			for (i=0;i<(int)strlen(URL);i++) {
+				Buffer[(*Length)++] = URL[i];//Text
+			}
+			Buffer[(*Length)++] = 0x00; 	// END Inline string
+
+#ifdef XXX
+			Buffer[(*Length)++] = 0x0A;	// created...
+			Buffer[(*Length)++] = 0xC3;	// OPAQUE
+			Buffer[(*Length)++] = 0x07;	// length
+			Buffer[(*Length)++] = 0x19;	// year
+			Buffer[(*Length)++] = 0x80;	// year
+			Buffer[(*Length)++] = 0x21;	// month
+			Buffer[(*Length)++] = 0x12;	// ..
+			Buffer[(*Length)++] = 0x00;	// ..
+			Buffer[(*Length)++] = 0x00;	// ..
+			Buffer[(*Length)++] = 0x00;	// ..
+			Buffer[(*Length)++] = 0x10;	// expires
+			Buffer[(*Length)++] = 0xC3;	// OPAQUE
+			Buffer[(*Length)++] = 0x04;	// length
+			Buffer[(*Length)++] = 0x20;	// year
+			Buffer[(*Length)++] = 0x10;	// year
+			Buffer[(*Length)++] = 0x06;	// month
+			Buffer[(*Length)++] = 0x25;	// day
+#endif
+
+		Buffer[(*Length)++] = 0x01;		// END (indication)		
+		Buffer[(*Length)++] = 0x03; 		// Inline string
+		for (i=0;i<(int)strlen(Text);i++) {
+			Buffer[(*Length)++] = Text[i];	//Text
+		}
+		Buffer[(*Length)++] = 0x00; 		// END Inline string
+		Buffer[(*Length)++] = 0x01;		// END (indication)		
+	Buffer[(*Length)++] = 0x01;			// END (SI)
 }
 
 void GSM_EncodeMMSFile(GSM_EncodeMultiPartMMSInfo *Info, unsigned char *Buffer, int *Length)
 {
 	int i;
 
 	strcpy(Buffer+(*Length),"\x8C\x80\x98\x4F");
 	(*Length)=(*Length)+4;
 
 	/* Unique MMS ID ? */
 	strcpy(Buffer+(*Length),"123456789");
 	(*Length)=(*Length)+9;
diff --git a/gammu/emb/common/service/gsmdata.h b/gammu/emb/common/service/gsmdata.h
index f5f8e07..e81589f 100644
--- a/gammu/emb/common/service/gsmdata.h
+++ b/gammu/emb/common/service/gsmdata.h
@@ -79,24 +79,26 @@ void 		NOKIA_EncodeWAPBookmarkSMSText	(unsigned char *Buffer, int *Length, GSM_W
 GSM_Error 	GSM_EncodeURLFile		(unsigned char *Buffer, int *Length, GSM_WAPBookmark *bookmark);
 
 /* ------------------------------ MMS Indicator ---------------------------- */
 
 typedef struct {
 	unsigned char		Address[500];
 	unsigned char		Title[200];
 	unsigned char		Sender[200];
 } GSM_MMSIndicator;
 
 void GSM_EncodeMMSIndicatorSMSText(unsigned char *Buffer, int *Length, GSM_MMSIndicator Indicator);
 
+void GSM_EncodeWAPIndicatorSMSText(unsigned char *Buffer, int *Length, char *Text, char *URL);
+
 /* ------------------------------ MMS file --------------------------------- */
 
 #define MAX_MULTI_MMS 20
 
 typedef enum {
 	MMS_Text = 1,
 	MMS_Bitmap_JPG
 } EncodeMultiPartMMSID;
 
 typedef struct {
 	EncodeMultiPartMMSID    ID;
 
diff --git a/gammu/emb/common/service/gsmlogo.c b/gammu/emb/common/service/gsmlogo.c
index c992915..7c19967 100644
--- a/gammu/emb/common/service/gsmlogo.c
+++ b/gammu/emb/common/service/gsmlogo.c
@@ -1,16 +1,17 @@
 /* (c) 2001-2004 by Marcin Wiacek */
 
 #include <string.h>
 #include <stdlib.h>
+#include <sys/stat.h>
 
 #include "../misc/misc.h"
 #include "../misc/coding/coding.h"
 #include "gsmlogo.h"
 #include "gsmnet.h"
 
 void PHONE_GetBitmapWidthHeight(GSM_Phone_Bitmap_Types Type, int *width, int *height)
 {
 	*width  = 0;
 	*height	= 0;
 	switch (Type) {
 		case GSM_EMSSmallPicture	: *width=8;  *height=8;  break;
@@ -152,24 +153,25 @@ void PHONE_DecodeBitmap(GSM_Phone_Bitmap_Types Type, char *buffer, GSM_Bitmap *B
 	Bitmap->Location		= 0;
 	Bitmap->Text[0]			= 0;
 	Bitmap->Text[1]			= 0;
 	Bitmap->BitmapEnabled		= false;
 	Bitmap->DefaultName		= false;
 	Bitmap->DefaultBitmap		= false;
 	Bitmap->DefaultRingtone		= false;
 	Bitmap->RingtoneID		= 0;
 	Bitmap->NetworkCode[0]		= 0;
 	Bitmap->Sender[0]		= 0;
 	Bitmap->Sender[1]		= 0;
 	Bitmap->ID			= 0;
+	Bitmap->Name			= NULL;
 
 	GSM_ClearBitmap(Bitmap);
 	for (x=0;x<Bitmap->BitmapWidth;x++) {
 		for (y=0;y<Bitmap->BitmapHeight;y++) {
 			if (PHONE_IsPointBitmap(Type, buffer, x, y, Bitmap->BitmapWidth, Bitmap->BitmapHeight)) {
 				GSM_SetPointBitmap(Bitmap,x,y);
 			}
 		}
 	}
 }
 
 void PHONE_ClearBitmap(GSM_Phone_Bitmap_Types Type, char *buffer, int width, int height)
@@ -617,35 +619,35 @@ static GSM_Error savewbmp(FILE *file, GSM_MultiBitmap *bitmap)
 	return ERR_NONE;
 }
 
 GSM_Error GSM_SaveBitmapFile(char *FileName, GSM_MultiBitmap *bitmap)
 {
 	FILE		*file;
 	GSM_Error 	error=ERR_NONE;
   
 	file = fopen(FileName, "wb");      
 	if (file == NULL) return ERR_CANTOPENFILE;
 
 	/* Attempt to identify filetype */
-	if (strstr(FileName,".nlm")) {
+	if (mystrcasestr(FileName,".nlm")) {
 		error=savenlm(file,bitmap);
-	} else if (strstr(FileName,".ngg")) {
+	} else if (mystrcasestr(FileName,".ngg")) {
 		error=savengg(file,bitmap);
-	} else if (strstr(FileName,".nol")) {
+	} else if (mystrcasestr(FileName,".nol")) {
 		error=savenol(file,bitmap);
-	} else if (strstr(FileName,".xpm")) {
+	} else if (mystrcasestr(FileName,".xpm")) {
 		error=savexpm(file,bitmap);
-	} else if (strstr(FileName,".nsl")) {
+	} else if (mystrcasestr(FileName,".nsl")) {
 		error=savensl(file,bitmap);
-	} else if (strstr(FileName,".wbmp")) {
+	} else if (mystrcasestr(FileName,".wbmp")) {
 		error=savewbmp(file,bitmap);
 	} else {
 		error=savebmp(file,bitmap);
 	}
 	fclose(file);
    
 	return error;
 }
 
 GSM_Error BMP2Bitmap(unsigned char *buffer, FILE *file,GSM_Bitmap *bitmap)
 {
 	bool		first_white,isfile=false;
@@ -946,50 +948,83 @@ static GSM_Error loadwbmp(FILE *file, GSM_MultiBitmap *bitmap)
 	fread(buffer,1,4,file);
 	bitmap->Bitmap[0].BitmapWidth  = buffer[2];
 	bitmap->Bitmap[0].BitmapHeight = buffer[3];
 	bitmap->Number 		 = 1;
 
 	fread(buffer,1,10000,file);
 	PHONE_DecodeBitmap(GSM_Nokia7110OperatorLogo, buffer, &bitmap->Bitmap[0]);
 	GSM_ReverseBitmap(&bitmap->Bitmap[0]);
 
 	return ERR_NONE;
 }
 
+static GSM_Error loadgif(FILE *file, GSM_MultiBitmap *bitmap)
+{
+	GSM_Bitmap *bmap = &bitmap->Bitmap[0];
+	char *buffer;
+	struct stat st;
+	int length;
+
+	dbgprintf("loading gif file\n");
+	fstat(fileno(file), &st);
+        bmap->BinaryPic.Length = length = st.st_size;
+	bmap->BinaryPic.Buffer = buffer = malloc(length);
+	if (bmap->BinaryPic.Buffer == NULL)
+		return ERR_MOREMEMORY;
+
+	fread(buffer, 1, length, file);
+        dbgprintf("Length %i name \"%s\"\n", length,
+		DecodeUnicodeString(bmap->Name));
+
+	bmap->Type = GSM_PictureBinary;
+	bmap->BinaryPic.Type = PICTURE_GIF;
+	bmap->BitmapWidth = 256 * buffer[7] + buffer[6];
+	bmap->BitmapHeight = 256 * buffer[9] + buffer[8];
+	bitmap->Number = 1;
+	
+	return ERR_NONE;
+}
+
 GSM_Error GSM_ReadBitmapFile(char *FileName, GSM_MultiBitmap *bitmap)
 {
 	FILE		*file;
 	unsigned char	buffer[300];
 
 	file = fopen(FileName, "rb");
 	if (file == NULL) return ERR_CANTOPENFILE;
 
+	bitmap->Bitmap[0].Name = malloc((strlen(FileName) + 1) * 2);
+	if (bitmap->Bitmap[0].Name == NULL) return ERR_MOREMEMORY;
+	EncodeUnicode(bitmap->Bitmap[0].Name, FileName, strlen(FileName));
+
 	fread(buffer, 1, 9, file); /* Read the header of the file. */
 	rewind(file);
 
 	bitmap->Bitmap[0].DefaultBitmap = false;
 
 	/* Attempt to identify filetype */
 	if (memcmp(buffer, "BM",2)==0) { 
 		return loadbmp(file,bitmap);
 	} else if (buffer[0] == 0x00 && buffer[1] == 0x00) { 
 		return loadwbmp(file,bitmap);
 	} else if (memcmp(buffer, "NLM",3)==0) {
 		return loadnlm(file,bitmap);
 	} else if (memcmp(buffer, "NOL",3)==0) {
 		return loadnolngg(file,bitmap,true);
 	} else if (memcmp(buffer, "NGG",3)==0) {
 		return loadnolngg(file,bitmap,false);
 	} else if (memcmp(buffer, "FORM",4)==0) {
 		return loadnsl(file,bitmap);
+	} else if (memcmp(buffer, "GIF",3)==0) {
+		return loadgif(file,bitmap);
 	}
 	return ERR_UNKNOWN;
 }
 
 void NOKIA_CopyBitmap(GSM_Phone_Bitmap_Types Type, GSM_Bitmap *Bitmap, char *Buffer, int *Length)
 {
 	int Width, Height;
 
 	Buffer[(*Length)++] = 0x00;
 	PHONE_GetBitmapWidthHeight(Type, &Width, &Height);
 	Buffer[(*Length)++] = Width;
 	Buffer[(*Length)++] = Height;
diff --git a/gammu/emb/common/service/gsmlogo.h b/gammu/emb/common/service/gsmlogo.h
index b1b579d..6c6e2d8 100644
--- a/gammu/emb/common/service/gsmlogo.h
+++ b/gammu/emb/common/service/gsmlogo.h
@@ -1,19 +1,33 @@
 /* (c) 2002-2004 by Marcin Wiacek */
 
 #ifndef __gsm_bitmaps_h
 #define __gsm_bitmaps_h
 
 #include "../gsmcomon.h"
 
+typedef enum {
+	PICTURE_BMP = 1,
+	PICTURE_GIF,
+	PICTURE_JPG,
+	PICTURE_ICN,
+	PICTURE_PNG
+} GSM_BinaryPicture_Types;
+
+typedef struct {
+	GSM_BinaryPicture_Types Type;
+	unsigned char 		*Buffer;
+	int 			Length;
+} GSM_BinaryPicture;
+
 /**
  * Enum to handle all possible bitmaps, which are not saved in various filesystems.
  */
 typedef enum {
 	GSM_None = 1,
 	/**
 	 * ID of static file in filesystem displayed during startup
 	 */
 	GSM_ColourStartupLogo_ID,
 	/**
 	 * Static mono bitmap/ID of animated mono bitmap displayed during startup
 	 */
@@ -36,25 +50,29 @@ typedef enum {
 	GSM_CallerGroupLogo,
 	/**
 	 * Text displayed during startup, which can't be removed from phone menu
 	 */
 	GSM_DealerNote_Text,
 	/**
 	 * Text displayed during startup
 	 */
 	GSM_WelcomeNote_Text,
 	/**
 	 * Image defined in Smart Messaging specification
 	 */
-	GSM_PictureImage
+	GSM_PictureImage,
+	/**
+	 * Binary picture (BMP, GIF, etc.)
+	 */
+	GSM_PictureBinary
 } GSM_Bitmap_Types;
 
 #define GSM_BITMAP_SIZE	(65+7)/8*96
 #define GSM_BITMAP_TEXT_LENGTH 128
 
 /**
  * Structure for all possible bitmaps, which are not saved in various filesystems
  */
 typedef struct {
 	/**
 	 * For all: bitmap type
 	 */
@@ -106,24 +124,32 @@ typedef struct {
 	/**
 	 * For operator logos: Network operator code
 	 */
 	char			NetworkCode[7];
 	/**
 	 * For picture images: number of sender
 	 */
 	unsigned char 		Sender[2 * (GSM_MAX_NUMBER_LENGTH + 1)];
 	/**
 	 * For colour bitmaps: ID
 	 */
 	unsigned char 		ID;
+	/**
+	 * For binary pictures (GIF, BMP, etc.): frame and length
+	 */
+	GSM_BinaryPicture 	BinaryPic;
+	/**
+	 * Bitmap name
+	 */
+	char			*Name;
 } GSM_Bitmap;
 
 #define MAX_MULTI_BITMAP 6
 
 /**
  * Structure to handle more than one bitmap
  */
 typedef struct {
 	/**
 	 * Number of bitmaps
 	 */
 	unsigned char		Number;
diff --git a/gammu/emb/common/service/gsmmisc.h b/gammu/emb/common/service/gsmmisc.h
index 37501ad..793d3d1 100644
--- a/gammu/emb/common/service/gsmmisc.h
+++ b/gammu/emb/common/service/gsmmisc.h
@@ -283,25 +283,30 @@ typedef struct {
 typedef struct {
 	int		Location;
 	unsigned char 	Name[300];
 	unsigned char 	URL[500];
 	bool		Active;
 } GSM_GPRSAccessPoint;
 
 /* ------------------------------------------------------------------------ */
 
 typedef enum {
 	GSM_Date_DDMMYYYY = 1,
 	GSM_Date_MMDDYYYY,
-	GSM_Date_YYYYMMDD
+	GSM_Date_YYYYMMDD,
+	GSM_Date_DDMMMYY,
+	GSM_Date_MMDDYY,
+	GSM_Date_DDMMYY,
+	GSM_Date_YYMMDD,
+	GSM_Date_OFF
 } GSM_DateFormat;
 
 typedef struct {
 	unsigned char 	DateSeparator;
 	GSM_DateFormat	DateFormat;
 	bool		AMPMTime;
 } GSM_Locale;
 
 /* ------------------------------------------------------------------------ */
 
 void ReadVCALDateTime(char *Buffer, GSM_DateTime *dt);
 void SaveVCALDateTime(char *Buffer, int *Length, GSM_DateTime *Date, char *Start);
diff --git a/gammu/emb/common/service/gsmring.c b/gammu/emb/common/service/gsmring.c
index 7df46f1..dab028c 100644
--- a/gammu/emb/common/service/gsmring.c
+++ b/gammu/emb/common/service/gsmring.c
@@ -1,21 +1,24 @@
 /* (c) 2001-2004 by Marcin Wiacek */
-/* Based on some work from Ralf Thelen (7110 ringtones),
- * Gnokii (RTTL and SM) and others
+/* Based on some work from Ralf Thelen (7110 ringtones) and others */
+/* Based on some work (RTTL and SM) from Gnokii (www.gnokii.org)
+ * (C) 1999-2000 Hugh Blemings & Pavel Janik ml. (C) 2001-2004 Pawel Kot 
+ * GNU GPL version 2 or later
  */
 
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 #include <math.h>
+#include <sys/stat.h>
 #ifdef WIN32
 #  include <windows.h>
 #endif
 
 #include "../gsmcomon.h"
 #include "../misc/coding/coding.h"
 #include "../gsmstate.h"
 #include "gsmring.h"
 #include "sms/gsmsms.h"
 
 int GSM_RingNoteGetFrequency(GSM_RingNote Note)
 {
@@ -147,24 +150,30 @@ static GSM_Error savebin(FILE *file, GSM_Ringtone *ringtone)
 	fwrite(&nullchar,1,1,file);
 	fwrite(&nullchar,1,1,file);
 	fwrite(ringtone->NokiaBinary.Frame,1,ringtone->NokiaBinary.Length,file);
 	return ERR_NONE;
 }
 
 static GSM_Error savepuremidi(FILE *file, GSM_Ringtone *ringtone)
 {
  	fwrite(ringtone->NokiaBinary.Frame,1,ringtone->NokiaBinary.Length,file);
 	return ERR_NONE;
 }
 
+static GSM_Error savemmf(FILE *file, GSM_Ringtone *ringtone)
+{
+ 	fwrite(ringtone->NokiaBinary.Frame,1,ringtone->NokiaBinary.Length,file);
+	return ERR_NONE;
+}
+
 GSM_Error saverttl(FILE *file, GSM_Ringtone *ringtone)
 {
 	GSM_RingNoteScale	DefNoteScale;
 	GSM_RingNoteDuration	DefNoteDuration;
 
 	GSM_RingNoteStyle	DefNoteStyle=0;
 	int			DefNoteTempo=0;
 
 	bool 			started = false, firstcomma = true;
 	GSM_RingNote 		*Note;
 
 	unsigned char 		buffer[15];
@@ -476,24 +485,27 @@ GSM_Error GSM_SaveRingtoneFile(char *FileName, GSM_Ringtone *ringtone)
 		} else if (strstr(FileName,".wav")) {
 			savewav(file,ringtone);
 		} else {
 			saverttl(file, ringtone);
 		}
 		break;
 	case RING_NOKIABINARY:
 		savebin(file, ringtone);
 		break;
 	case RING_MIDI: 
 		savepuremidi(file, ringtone);
 		break;
+	case RING_MMF:
+		savemmf(file, ringtone);
+		break;
 	}   	
 
 	fclose(file);
    
 	return ERR_NONE;
 }
 
 static GSM_Error loadrttl(FILE *file, GSM_Ringtone *ringtone)
 {
 	GSM_RingNoteScale	DefNoteScale	= Scale_880;
 	GSM_RingNoteDuration	DefNoteDuration	= Duration_1_4;
 	GSM_RingNoteStyle	DefNoteStyle	= NaturalStyle;
@@ -760,24 +772,44 @@ static GSM_Error loadbin(FILE *file, GSM_Ringtone *ringtone)
 static GSM_Error loadpuremidi(FILE *file, GSM_Ringtone *ringtone)
 {
 	unsigned char buffer[30000];
 
 	dbgprintf("loading midi\n");
 	EncodeUnicode(ringtone->Name,"MIDI",4);
 	ringtone->NokiaBinary.Length=fread(buffer, 1, 30000, file);
 	memcpy(ringtone->NokiaBinary.Frame,buffer,ringtone->NokiaBinary.Length);
 	dbgprintf("Length %i name \"%s\"\n",ringtone->NokiaBinary.Length,DecodeUnicodeString(ringtone->Name));
 	return ERR_NONE;
 }
 
+static GSM_Error loadmmf(FILE *file, GSM_Ringtone *ringtone)
+{
+	struct 	stat st;
+	char 	*buffer;
+	int 	length;
+
+	dbgprintf("loading smaf file\n");
+	fstat(fileno(file), &st);
+	ringtone->BinaryTone.Length = length = st.st_size;
+	ringtone->BinaryTone.Buffer = buffer = malloc(length);
+	if (buffer == NULL)
+		return ERR_MOREMEMORY;
+	fread(buffer, 1, length, file);
+
+	dbgprintf("Length %i name \"%s\"\n", length,
+		DecodeUnicodeString(ringtone->Name));
+
+	return ERR_NONE;
+}
+
 static GSM_Error loadre(FILE *file, GSM_Ringtone *ringtone)
 {
 	unsigned char buffer[2000];
 
 	ringtone->NokiaBinary.Length=fread(buffer, 1, 500, file);
 
 	if (buffer[18]==0x00 && buffer[21]!=0x02) {
 		/* DCT3, Unicode subformat, 62xx & 7110 */
 		CopyUnicodeString(ringtone->Name,buffer+18);
 		ringtone->NokiaBinary.Length = ringtone->NokiaBinary.Length - (21+UnicodeLength(ringtone->Name)*2);
 		memcpy(ringtone->NokiaBinary.Frame,buffer+21+UnicodeLength(ringtone->Name)*2,ringtone->NokiaBinary.Length);
 	} else {
@@ -807,24 +839,28 @@ GSM_Error GSM_ReadRingtoneFile(char *FileName, GSM_Ringtone *ringtone)
 		if (buffer[0]==0x00 && buffer[1]==0x00 &&
 		    buffer[2]==0x0C && buffer[3]==0x01) {
 			ringtone->Format = RING_NOKIABINARY;
 		}
 		if (buffer[0]==0x00 && buffer[1]==0x00 &&
 		    buffer[2]==0x00) {
 			ringtone->Format = RING_NOKIABINARY;
 		}
 		if (buffer[0]==0x4D && buffer[1]==0x54 &&
 		    buffer[2]==0x68 && buffer[3]==0x64) {
 			ringtone->Format = RING_MIDI;
 		}
+		if (buffer[0]==0x4D && buffer[1]==0x4D &&
+		    buffer[2]==0x4D && buffer[3]==0x44) {
+			ringtone->Format = RING_MMF;
+		}
 	}
 	rewind(file);
 	switch (ringtone->Format) {
 	case RING_NOTETONE:
 		if (buffer[0]==0x02 && buffer[1]==0x4A) {
 			error=loadott(file,ringtone);
 		} else if (buffer[0]==0xC7 && buffer[1]==0x45) {
 			error=loadcommunicator(file,ringtone);
 		} else {
 			error=loadrttl(file,ringtone);
 		}
 		ringtone->NoteTone.AllNotesScale=false;
@@ -833,24 +869,29 @@ GSM_Error GSM_ReadRingtoneFile(char *FileName, GSM_Ringtone *ringtone)
 		if (buffer[0]==0x00 && buffer[1]==0x00 &&
 		    buffer[2]==0x0C && buffer[3]==0x01) {
 			error=loadbin(file,ringtone);
 		}
 		if (buffer[0]==0x00 && buffer[1]==0x00 &&
 		    buffer[2]==0x00) {
 			error=loadre(file,ringtone);
 		}
 		break;
 	case RING_MIDI:
 		EncodeUnicode(ringtone->Name,FileName,strlen(FileName));
 		error = loadpuremidi(file,ringtone);
+		break;
+	case RING_MMF:
+		EncodeUnicode(ringtone->Name,FileName,strlen(FileName));
+		error = loadmmf(file,ringtone);
+		break;
 	}
 	fclose(file);
 	return(error);
 }
 
 /* -------------------------- required with Nokia & RTTL ------------------- */
 
 /* Beats per Minute like written in Smart Messaging */
 static int SM_BeatsPerMinute[] = {
 	25,	28,	31,	35,	40,	45,	50,	56,	63,	70,
 	80,	90,	100,	112,	125,	140,	160,	180,	200,	225,
 	250,	285,	320,	355,	400,	450,	500,	565,	635,	715,
diff --git a/gammu/emb/common/service/gsmring.h b/gammu/emb/common/service/gsmring.h
index 207cf31..2d2dd7a 100644
--- a/gammu/emb/common/service/gsmring.h
+++ b/gammu/emb/common/service/gsmring.h
@@ -111,39 +111,41 @@ typedef enum {
 typedef struct {
 	GSM_RingCommandType			Type;
 	GSM_RingNote				Note;
 	unsigned char				Value;
 } GSM_RingCommand;
 
 typedef struct {
 	int					NrCommands;
 	GSM_RingCommand				Commands[MAX_RINGTONE_NOTES];
 	bool					AllNotesScale;
 } GSM_NoteRingtone;
 
+/* FIXME: should use BinaryTone instead? */
 /* Structure to hold Nokia binary ringtones. */
 typedef struct {
-	unsigned char				Frame[30000];
+	unsigned char				Frame[50000];
 	int					Length;
 } GSM_NokiaBinaryRingtone;
 
 typedef struct {
-	unsigned char				*Frame;
+	unsigned char				*Buffer;
 	int					Length;
 } GSM_BinaryTone;
 
 typedef enum {
 	RING_NOTETONE = 1,
 	RING_NOKIABINARY,
-	RING_MIDI
+	RING_MIDI,
+	RING_MMF
 } GSM_RingtoneFormat;
 
 /**
  * Structure for saving various ringtones formats
  */
 typedef struct {
 	/**
 	 * Ringtone saved in one of three formats
 	 */
 	GSM_NokiaBinaryRingtone			NokiaBinary;
 	GSM_BinaryTone				BinaryTone;
 	GSM_NoteRingtone			NoteTone;
diff --git a/gammu/emb/common/service/sms/gsmmulti.c b/gammu/emb/common/service/sms/gsmmulti.c
index 6c1cdcd..bdb5ee9 100644
--- a/gammu/emb/common/service/sms/gsmmulti.c
+++ b/gammu/emb/common/service/sms/gsmmulti.c
@@ -478,24 +478,29 @@ GSM_Error GSM_EncodeMultiPartSMS(GSM_MultiPartSMSInfo		*Info,
 		for (i=0;i<Info->Entries[0].Bitmap->Number;i++) {
 			Buffer[Length++] = Info->Entries[0].Bitmap->Bitmap[i].BitmapWidth;
 			Buffer[Length++] = Info->Entries[0].Bitmap->Bitmap[i].BitmapHeight;
 			PHONE_EncodeBitmap(GSM_AlcatelBMMIPicture, Buffer+Length, &Info->Entries[0].Bitmap->Bitmap[i]);
 			Length += PHONE_GetBitmapSize(GSM_AlcatelBMMIPicture,Info->Entries[0].Bitmap->Bitmap[i].BitmapWidth,Info->Entries[0].Bitmap->Bitmap[i].BitmapHeight);
 		}
 		return GSM_EncodeAlcatelMultiPartSMS(SMS,Buffer,Length,Info->Entries[0].Bitmap->Bitmap[0].Text,ALCATELTDD_ANIMATION);
 	case SMS_MMSIndicatorLong:
 		Class	= 1;
 		UDH	= UDH_MMSIndicatorLong;
 		GSM_EncodeMMSIndicatorSMSText(Buffer,&Length,*Info->Entries[0].MMSIndicator);
 		break;
+	case SMS_WAPIndicatorLong:
+		Class	= 1;
+		UDH	= UDH_MMSIndicatorLong;
+		GSM_EncodeWAPIndicatorSMSText(Buffer,&Length,Info->Entries[0].MMSIndicator->Title,Info->Entries[0].MMSIndicator->Address);
+		break;
 	case SMS_NokiaRingtoneLong:
 	case SMS_NokiaRingtone:
 		UDH	= UDH_NokiaRingtone;
 		Class	= 1;
 		/* 7 = length of UDH_NokiaRingtone UDH header */
 		Length  = GSM_MAX_8BIT_SMS_LENGTH-7;
 		Info->Entries[0].RingtoneNotes = GSM_EncodeNokiaRTTLRingtone(*Info->Entries[0].Ringtone,Buffer,&Length);
 		if (Info->Entries[0].ID == SMS_NokiaRingtone) break;
 		if (Info->Entries[0].RingtoneNotes != Info->Entries[0].Ringtone->NoteTone.NrCommands) {
 			UDH    = UDH_NokiaRingtoneLong;
 			Length = (GSM_MAX_8BIT_SMS_LENGTH-12)*3;
 			Info->Entries[0].RingtoneNotes = GSM_EncodeNokiaRTTLRingtone(*Info->Entries[0].Ringtone,Buffer,&Length);
diff --git a/gammu/emb/common/service/sms/gsmmulti.h b/gammu/emb/common/service/sms/gsmmulti.h
index c672261..3f70d81 100644
--- a/gammu/emb/common/service/sms/gsmmulti.h
+++ b/gammu/emb/common/service/sms/gsmmulti.h
@@ -1,17 +1,21 @@
 /* (c) 2002-2004 by Marcin Wiacek */
 
 #ifndef __gsm_multi_h
 #define __gsm_multi_h
 
+#if defined(_MSC_VER) && defined(__cplusplus)
+    extern "C" {
+#endif
+
 #include "../../gsmcomon.h"
 #include "../gsmlogo.h"
 #include "../gsmcal.h"
 #include "../gsmpbk.h"
 #include "../gsmdata.h"
 #include "../gsmring.h"
 #include "gsmsms.h"
 
 /* ---------------------- multi SMS --------------------------------------- */
 
 /* Identifiers for Smart Messaging 3.0 multipart SMS */
 
@@ -163,42 +167,43 @@ typedef enum {
 	/**
 	 * IMelody 1.2
 	 */
 	SMS_EMSSound12,
 	/**
 	 * IMelody without header - SonyEricsson extension
 	 */
 	SMS_EMSSonyEricssonSound,
 	/**
 	 * IMelody 1.0 with UPI.
 	 */
 	SMS_EMSSound10Long,
-	/***
+	/**
 	 * IMelody 1.2 with UPI.
 	 */
 	SMS_EMSSound12Long,
 	/**
 	 * IMelody without header with UPI.
 	 */
 	SMS_EMSSonyEricssonSoundLong,
 	SMS_EMSPredefinedSound,
 	SMS_EMSPredefinedAnimation,
 	SMS_EMSAnimation,
 	/**
 	 * Fixed bitmap of size 16x16 or 32x32.
 	 */
 	SMS_EMSFixedBitmap,
 	SMS_EMSVariableBitmap,
 	SMS_EMSVariableBitmapLong,
 	SMS_MMSIndicatorLong,
+	SMS_WAPIndicatorLong,
 	/**
 	 * Variable bitmap with black and white colors
 	 */
 	SMS_AlcatelMonoBitmapLong,
 	/**
 	 * Variable animation with black and white colors
 	 */
 	SMS_AlcatelMonoAnimationLong,
 	SMS_AlcatelSMSTemplateName
 } EncodeMultiPartSMSID;
 
 typedef struct {
@@ -255,17 +260,21 @@ bool GSM_DecodeMultiPartSMS (GSM_MultiPartSMSInfo *Info, GSM_MultiSMSMessage *SM
 void GSM_ClearMultiPartSMSInfo (GSM_MultiPartSMSInfo *Info);
 
 /**
  * Frees any allocated structures inside @ref GSM_MultiPartSMSInfo.
  */
 void GSM_FreeMultiPartSMSInfo (GSM_MultiPartSMSInfo *Info);
 
 /**
  * Links SMS messages according to IDs.
  */
 GSM_Error GSM_LinkSMS(GSM_MultiSMSMessage **INPUT, GSM_MultiSMSMessage **OUTPUT, bool ems);
 
+#if defined(_MSC_VER) && defined(__cplusplus)
+    }
+#endif
+
 #endif
 
 /* How should editor hadle tabs in this file? Add editor commands here.
  * vim: noexpandtab sw=8 ts=8 sts=8:
  */
diff --git a/gammu/emb/common/service/sms/gsmsms.c b/gammu/emb/common/service/sms/gsmsms.c
index 9920835..feceba4 100644
--- a/gammu/emb/common/service/sms/gsmsms.c
+++ b/gammu/emb/common/service/sms/gsmsms.c
@@ -1,14 +1,17 @@
 /* (c) 2001-2004 by Marcin Wiacek */
-/* based on some work from Pawel Kot, others and Gnokii */
+/* Based on some Pawel Kot and others work from Gnokii (www.gnokii.org)
+ * (C) 1999-2000 Hugh Blemings & Pavel Janik ml. (C) 2001-2004 Pawel Kot 
+ * GNU GPL version 2 or later
+ */
 
 #include <ctype.h>
 #include <string.h>
 #include <time.h>
 
 #include "../../gsmcomon.h"
 #include "../../misc/coding/coding.h"
 #include "../gsmcal.h"
 #include "../gsmpbk.h"
 #include "../gsmlogo.h"
 #include "../gsmring.h"
 #include "../gsmdata.h"
diff --git a/gammu/emb/common/service/sms/gsmsms.h b/gammu/emb/common/service/sms/gsmsms.h
index d87ff60..0b950d3 100644
--- a/gammu/emb/common/service/sms/gsmsms.h
+++ b/gammu/emb/common/service/sms/gsmsms.h
@@ -1,14 +1,17 @@
 /* (c) 2001-2004 by Marcin Wiacek */
-/* based on some work from Pawel Kot, others and Gnokii */
+/* Based on some Pawel Kot and others work from Gnokii (www.gnokii.org)
+ * (C) 1999-2000 Hugh Blemings & Pavel Janik ml. (C) 2001-2004 Pawel Kot 
+ * GNU GPL version 2 or later
+ */
 
 #ifndef __gsm_sms_h
 #define __gsm_sms_h
 
 #include "../../gsmcomon.h"
 #include "../gsmlogo.h"
 #include "../gsmcal.h"
 #include "../gsmpbk.h"
 #include "../gsmdata.h"
 #include "../gsmring.h"
 
 /* --------------------- Some general definitions ------------------------- */
diff --git a/gammu/emb/gammu/depend/nokia/dct3.c b/gammu/emb/gammu/depend/nokia/dct3.c
index d4a55da..b9e47ea 100644
--- a/gammu/emb/gammu/depend/nokia/dct3.c
+++ b/gammu/emb/gammu/depend/nokia/dct3.c
@@ -601,28 +601,32 @@ static GSM_Error DCT3_Reply61GetSecurityCode(GSM_Protocol_Message msg, GSM_State
 	printf("Security Code is \"%s\"\n",msg.Buffer+5);
 	return ERR_NONE;
 }
 
 static GSM_Error DCT3_Reply7191GetSecurityCode(GSM_Protocol_Message msg, GSM_StateMachine *s)
 {
 	printf("Security Code is \"%s\"\n",msg.Buffer+6);
 	return ERR_NONE;
 }
 
 void DCT3GetSecurityCode(int argc, char *argv[])
 {
+#ifdef GSM_ENABLE_NOKIA6110
 	unsigned char req6110[] = {0x00, 0x01, 0x6e,
 				   0x01};	/* Code type */
+#endif
+#if defined(GSM_ENABLE_NOKIA7110) || defined(GSM_ENABLE_NOKIA9210)
 	unsigned char req71_91[] = {N7110_FRAME_HEADER, 0xee,
 				    0x1c};	/* Setting */
+#endif
 
 	if (CheckDCT3Only()!=ERR_NONE) return;
 
 	error=DCT3_EnableSecurity (&s, 0x01);
 	Print_Error(error);
 
 	s.User.UserReplyFunctions=UserReplyFunctions3;
 
 #ifdef GSM_ENABLE_NOKIA6110
 	if (strstr(N6110Phone.models, s.Phone.Data.ModelInfo->model) != NULL) {
 		error=GSM_WaitFor (&s, req6110, 4, 0x40, 4, ID_User6);
 	}
@@ -758,26 +762,28 @@ void DCT3DisplayOutput(int argc, char *argv[])
 		my_sleep(10);
 	}
 
 	req[4] = 0x02;
 	error=GSM_WaitFor (&s, req, 5, 0x0d, 4, ID_User7);
 	Print_Error(error);
 
 	GSM_Terminate();
 }
 #endif
 
 static GSM_Reply_Function UserReplyFunctions3[] = {
+#ifdef GSM_ENABLE_NOKIA6110
 	{DCT3_ReplyDisplayOutput,	"\x0D",0x03,0x50,ID_IncomingFrame	},
 	{DCT3_ReplyDisplayOutput,	"\x0D",0x03,0x54,ID_User7	 	},
+#endif
 
 	{DCT3_ReplyEnableSecurity2,	"\x40",0x02,0x64,ID_EnableSecurity	},
 	{DCT3_ReplyResetTest36,		"\x40",0x02,0x65,ID_User2 	 	},
 	{DCT3_ReplyGetADC,		"\x40",0x02,0x68,ID_User3 	 	},
 	{DCT3_ReplyGetPPS,		"\x40",0x02,0x6A,ID_User4 	 	},
 	{DCT3_ReplySetPPS,		"\x40",0x02,0x6B,ID_User4 	 	},
 	{DCT3_Reply61GetSecurityCode,	"\x40",0x02,0x6E,ID_User6 	 	},
 	{DCT3_ReplySimlockInfo,		"\x40",0x02,0x8A,ID_User3	 	},
 #ifdef GSM_ENABLE_NOKIA6110
 	{DCT3_ReplySetOperatorName,	"\x40",0x02,0x8B,ID_User7	 	},
 	{DCT3_ReplyGetOperatorName,	"\x40",0x02,0x8C,ID_User5	 	},
 #endif
diff --git a/gammu/emb/gammu/depend/nokia/dct4.c b/gammu/emb/gammu/depend/nokia/dct4.c
index f4ed305..4bf958d 100644
--- a/gammu/emb/gammu/depend/nokia/dct4.c
+++ b/gammu/emb/gammu/depend/nokia/dct4.c
@@ -26,25 +26,26 @@ GSM_Error CheckDCT4Only()
  	if (strstr(N3650Phone.models, s.Phone.Data.ModelInfo->model) != NULL) found = true;
 #endif
 #ifdef GSM_ENABLE_NOKIA6510
  	if (strstr(N6510Phone.models, s.Phone.Data.ModelInfo->model) != NULL) found = true;
 #endif
 #ifdef GSM_ENABLE_NOKIA3320
  	if (strstr(N3320Phone.models, s.Phone.Data.ModelInfo->model) != NULL) found = true;
 #endif
 	if (!found) return ERR_NOTSUPPORTED;
 
 	if (s.ConnectionType!=GCT_MBUS2	     && s.ConnectionType!=GCT_FBUS2      &&
 	    s.ConnectionType!=GCT_FBUS2DLR3  && s.ConnectionType!=GCT_PHONETBLUE &&
-	    s.ConnectionType!=GCT_IRDAPHONET && s.ConnectionType!=GCT_BLUEPHONET) {
+	    s.ConnectionType!=GCT_IRDAPHONET && s.ConnectionType!=GCT_BLUEPHONET &&
+	    s.ConnectionType!=GCT_FBUS2DKU5) {
 		return ERR_OTHERCONNECTIONREQUIRED;
 	}
 	return ERR_NONE;
 }
 
 static void CheckDCT4()
 {
 	GSM_Error error;
 
 	error = CheckDCT4Only();
 	switch (error) {
 	case ERR_NOTSUPPORTED:
@@ -876,24 +877,26 @@ void DCT4GetT9(int argc, char *argv[])
 		error=GSM_WaitFor (&s, req, 18, 0x23, 4, ID_User3);		
 		Print_Error(error);
 		if (i==0) {
 			T9Dictionary = T9FullSize;
 			dbgprintf("T9 dictionary size is %i\n",T9Dictionary);
 		}
 		i+=T9Size;
 	}
 
 	fclose(T9File);
 }
 
+#ifdef GSM_ENABLE_NOKIA6510
+
 extern GSM_Error N6510_SetLight(GSM_StateMachine *s, N6510_PHONE_LIGHTS light, bool enable);
 
 void DCT4SetLight(int argc, char *argv[])
 {
 	int			i;
 	N6510_PHONE_LIGHTS 	type;
 	bool			enable;
 
 	if (mystrncasecmp(argv[2],"display",0)) { 	type = N6510_LIGHT_DISPLAY;
 	} else if (mystrncasecmp(argv[2],"keypad",0)) {	type = N6510_LIGHT_KEYPAD;
 	} else if (mystrncasecmp(argv[2],"torch",0)) {	type = N6510_LIGHT_TORCH;
 	} else {
@@ -912,24 +915,25 @@ void DCT4SetLight(int argc, char *argv[])
 		s.Config[i].StartInfo = "false";
 	}
 
 	GSM_Init(true);
 
         CheckDCT4();
 
 	error=N6510_SetLight(&s, type, enable);
 	Print_Error(error);
 
 	GSM_Terminate();
 }
+#endif
 
 void DCT4DisplayTest(int argc, char *argv[])
 {
 	unsigned char ans[200];
 	unsigned char req0[] = {0x00, 0x08, 0x0D, 0x00, 0x0F, 0x00};
 	unsigned char req[] =  {0x00, 0x08, 0x0E, 0x00, 0x12, 0x01, 0x00, 0x04,
 				0x09,		/* test number */
 				0x00};
 
 	if (CheckDCT4Only()!=ERR_NONE) return;
 
 	s.User.UserReplyFunctions=UserReplyFunctions4;
@@ -1012,24 +1016,26 @@ void DCT4GetADC(int argc, char *argv[])
 		error=GSM_WaitFor (&s, GetRaw, 6, 0x17, 4, ID_User3);		
 		Print_Error(error);
 		GetUnit[4] 	= i;
 		ADC		= DCT4ADC[i].x;
 		error=GSM_WaitFor (&s, GetUnit, 6, 0x17, 4, ID_User3);		
 		Print_Error(error);
 		printf("%s\n",DCT4ADC[i].unit);
 		i++;
 		if (DCT4ADC[i].name[0] == 0x00) break;
 	}
 }
 
+#ifdef GSM_ENABLE_NOKIA6510
+
 static double 		RadioFreq;
 static unsigned char 	RadioName[100];
 
 static GSM_Error DCT4_ReplyTuneRadio(GSM_Protocol_Message msg, GSM_StateMachine *s)
 {
 	int 		length;
 	unsigned char 	name[100];
 
 	switch (msg.Buffer[3]) {
 	case 0x09:
 		N6510_DecodeFMFrequency(&RadioFreq, msg.Buffer+16);
 
@@ -1165,24 +1171,25 @@ void DCT4TuneRadio(int argc, char *argv[])
 			error=Phone->SetFMStation(&s,&FMStation[i]);
 			Print_Error(error);
 			fprintf(stderr,"%cWriting: %i percent",13,(i+1)*100/num);
 		}
 		fprintf(stderr,"\n");
 	}
 
 	error=GSM_WaitFor (&s, Disable, 6, 0x3E, 4, ID_User3);
 	Print_Error(error);
 
 	GSM_Terminate();
 }
+#endif
 
 void DCT4PlaySavedRingtone(int argc, char *argv[])
 {
 	unsigned char req[] =  {N6110_FRAME_HEADER, 
 			      	0x01,
 				0x00,0x64,	//id
 				0x01,		//group
 				0x01,0x00,0x00,
 				0x0A,		//volume
 				0x00,0x00,0x00,0x00,0x00,0x00,0x00};
 	GSM_AllRingtonesInfo Info;
 
@@ -1304,28 +1311,30 @@ static GSM_Reply_Function UserReplyFunctions4[] = {
 
 	{DCT4_ReplyGetSecurityCode,	"\x23",0x03,0x05,ID_User1	},
 	{DCT4_ReplyGetT9,		"\x23",0x03,0x05,ID_User3	},
 	{DCT4_ReplyGetVoiceRecord,	"\x23",0x03,0x05,ID_User4	},
 	{DCT4_ReplyGetVoiceRecord,	"\x23",0x03,0x0D,ID_User4	},
 	{DCT4_ReplyGetSecurityCode,	"\x23",0x03,0x0D,ID_User1	}, 
 
 	{DCT4_ReplyTestsStartup,	"\x35",0x02,0x01,ID_User3	},
 	{DCT4_ReplyTestsStartup,	"\x35",0x02,0x02,ID_User3	},
 	{DCT4_ReplyTestsNames,		"\x35",0x02,0x03,ID_User1	},
 	{DCT4_ReplyTestsStatus,		"\x35",0x02,0x04,ID_User2	},
 
+#ifdef GSM_ENABLE_NOKIA6510
 	{DCT4_ReplyTuneRadio,		"\x3E",0x03,0x09,ID_User3	},
 	{DCT4_ReplyTuneRadio,		"\x3E",0x03,0x15,ID_User3	},
 	{DCT4_ReplyTuneRadio,		"\x3E",0x03,0x15,ID_SetFMStation},
 	{DCT4_ReplyTuneRadio,		"\x3E",0x03,0x16,ID_User3	},
+#endif
 
 	{DCT4_ReplyGetVoiceRecord,	"\x4A",0x03,0x31,ID_User4	},
 
 	{DCT4_ReplyGetSimlock,		"\x53",0x03,0x0D,ID_User6	},
 	{DCT4_ReplyGetSimlock,		"\x53",0x03,0x13,ID_User6	},
 
 	{DCT4_ReplyMakeCameraShoot,	"\x61",0x03,0x03,ID_User3	},
 	{DCT4_ReplyMakeCameraShoot,	"\x61",0x03,0x07,ID_User3	},
 	{DCT4_ReplyMakeCameraShoot,	"\x61",0x03,0x08,ID_User3	},
 	{DCT4_ReplyMakeCameraShoot,	"\x61",0x03,0x0A,ID_User3	},
 	{DCT4_ReplyMakeCameraShoot,	"\x61",0x03,0xF0,ID_User3	},
 
diff --git a/gammu/emb/gammu/depend/nokia/dct4.h b/gammu/emb/gammu/depend/nokia/dct4.h
index fde5b08..fae809f 100644
--- a/gammu/emb/gammu/depend/nokia/dct4.h
+++ b/gammu/emb/gammu/depend/nokia/dct4.h
@@ -1,35 +1,38 @@
 /* (c) 2002-2004 by Marcin Wiacek */
 
 #include "../../../common/gsmstate.h"
 
 void DCT4SetPhoneMenus	   (int argc, char *argv[]);
 void DCT4SelfTests	   (int argc, char *argv[]);
 void DCT4SetVibraLevel	   (int argc, char *argv[]);
 void DCT4GetSecurityCode   (int argc, char *argv[]);
-#ifdef DEBUG
-void DCT4ResetSecurityCode (int argc, char *argv[]);
-#endif
 void DCT4GetVoiceRecord	   (int argc, char *argv[]);
 void DCT4Info		   (int argc, char *argv[]);
 void DCT4GetT9		   (int argc, char *argv[]);
-void DCT4SetLight	   (int argc, char *argv[]);
 void DCT4DisplayTest	   (int argc, char *argv[]);
 void DCT4GetADC		   (int argc, char *argv[]);
 void DCT4VibraTest	   (int argc, char *argv[]);
-void DCT4TuneRadio	   (int argc, char *argv[]);
 void DCT4PlaySavedRingtone (int argc, char *argv[]);
 void DCT4MakeCameraShoot   (int argc, char *argv[]);
 void DCT4GetScreenDump	   (int argc, char *argv[]);
 
+#ifdef DEBUG
+	void DCT4ResetSecurityCode (int argc, char *argv[]);
+#endif
+#ifdef GSM_ENABLE_NOKIA6510
+	void DCT4SetLight	   (int argc, char *argv[]);
+	void DCT4TuneRadio	   (int argc, char *argv[]);
+#endif
+
 /* ------------------- features matrix ------------------------------------- */
 
 typedef enum {
 	DCT4_ALWAYS_ONLINE = 1,
 	DCT4_GPRS_PCCH,
 	DCT4_GEA1,
 	DCT4_EOTD,
 	DCT4_WAP_PUSH,
 	DCT4_USE_PREF_SIM_NET,
 	DCT4_JAVA_TCK,
 
 	DCT4_ALS,
diff --git a/gammu/emb/gammu/gammu.c b/gammu/emb/gammu/gammu.c
index 997485a..f49ae36 100644
--- a/gammu/emb/gammu/gammu.c
+++ b/gammu/emb/gammu/gammu.c
@@ -1,24 +1,23 @@
 /* (c) 2002-2004 by Marcin Wiacek and Michal Cihar */
 /* FM stuff by Walek */
 
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <locale.h>
 #include <signal.h>
 #include <ctype.h>
 #include <wchar.h>
-#undef HAVE_MYSQL_MYSQL_H
 #ifdef WIN32
 #  include <windows.h>
 #  include <process.h>
 #  ifdef _MSC_VER
 #    include <sys/utime.h>
 #  else
 #    include <utime.h>
 #  endif
 #else
 #  include <utime.h>
 #endif
 
@@ -39,45 +38,33 @@
 #  include "depend/siemens/dsiemens.h"
 #endif
 
 #ifdef HAVE_PTHREAD
 #  include <pthread.h>
 #endif
 
 #ifdef HAVE_SYS_IOCTL_H
 #  include <sys/ioctl.h>
 #endif
 
                 			
-//static GSM_StateMachine		s;
-//static GSM_Phone_Functions		*Phone;
+GSM_StateMachine		s;
+GSM_Phone_Functions		*Phone;
 static INI_Section		*cfg 			= NULL;
 
-//static GSM_Error			error 			= ERR_NONE;
+GSM_Error			error 			= ERR_NONE;
  static int			i;
 
-//static  bool 			gshutdown 		= false;
-typedef struct {
-	unsigned char		Connection[50];
-} OneConnectionInfo;
-
-typedef struct {
-	unsigned char 		Device[50];
-	OneConnectionInfo 	Connections[6];
-	//GSM_StateMachine	s;
-} OneDeviceInfo;
+volatile bool 			gshutdown 		= false;
 
-static int				num;
-static OneDeviceInfo			SearchDevices[100];
-static bool				SearchOutput;
 void interrupt(int sign)
 {
 	signal(sign, SIG_IGN);
 	gshutdown = true;
 }
 
 #ifdef __GNUC__
 __attribute__((format(printf, 1, 2)))
 #endif
 int printmsg(char *format, ...)
 {
 	va_list		argp;
@@ -234,24 +221,25 @@ static GSM_Error GSM_PlayRingtone(GSM_Ringtone ringtone)
 
 	for (i=0;i<ringtone.NoteTone.NrCommands;i++) {
 		if (gshutdown) break;
 		if (ringtone.NoteTone.Commands[i].Type != RING_NOTETONE) continue;
 		error=PHONE_RTTLPlayOneNote(&s,ringtone.NoteTone.Commands[i].Note,first);
 		if (error!=ERR_NONE) return error;
 		first = false;
 	}
   
 	/* Disables buzzer */
 	return s.Phone.Functions->PlayTone(&s,255*255,0,false);
 }
+
 static void PlayRingtone(int argc, char *argv[])
 {
 	GSM_Ringtone ringtone,ringtone2;
 
 	ringtone.Format	= 0;
 	error=GSM_ReadRingtoneFile(argv[2],&ringtone);
 	Print_Error(error);
 
 	error=GSM_RingtoneConvert(&ringtone2,&ringtone,RING_NOTETONE);
 	Print_Error(error);
 
 	GSM_Init(true);
@@ -332,25 +320,24 @@ static void Identify(int argc, char *argv[])
 	}
 
 #ifdef GSM_ENABLE_NOKIA_DCT3
 	DCT3Info(argc, argv);
 #endif
 #ifdef GSM_ENABLE_NOKIA_DCT4
 	DCT4Info(argc, argv);
 #endif
 
 	GSM_Terminate();
 }
 
-//#if 0
 static void GetDateTime(int argc, char *argv[])
 {
 	GSM_DateTime 	date_time;
 	GSM_Locale	locale;
 
 	GSM_Init(true);
 
 	error=Phone->GetDateTime(&s, &date_time);
 	switch (error) {
 	case ERR_EMPTY:
 		printmsg("Date and time not set in phone\n");
 		break;
@@ -366,24 +353,25 @@ static void GetDateTime(int argc, char *argv[])
 	case ERR_NOTSUPPORTED:
 	case ERR_NOTIMPLEMENTED:
 		break;
 	default:
 		Print_Error(error);
 		printmsg("Time format is ");
 		if (locale.AMPMTime) printmsg("12 hours\n"); else printmsg("24 hours\n");
 		printmsg("Date format is ");
 		switch (locale.DateFormat) {
 			case GSM_Date_DDMMYYYY:printmsg("DD MM YYYY");break;
 			case GSM_Date_MMDDYYYY:printmsg("MM DD YYYY");break;
 			case GSM_Date_YYYYMMDD:printmsg("YYYY MM DD");
+			default               :break;
 		}
 		printmsg(", date separator is %c\n",locale.DateSeparator);
 	}
 
 	GSM_Terminate();
 }
 
 static void SetDateTime(int argc, char *argv[])
 {
 	GSM_DateTime date_time;
 
 	GSM_GetCurrentDateTime(&date_time);
@@ -578,66 +566,83 @@ static void GetAllMemory(int argc, char *argv[])
 		if (error == ERR_EMPTY) break;
 		Print_Error(error);
 		printmsg("Memory %s, Location %i\n",argv[2],Entry.Location);
 		PrintMemoryEntry(&Entry);
  		start = false;
 	}
 
 	GSM_Terminate();        	
 }
 
 static void GetMemory(int argc, char *argv[])
 {
-	int			j, start, stop;
+	int			j, start, stop, emptynum = 0, fillednum = 0;
 	GSM_MemoryEntry		entry;
+	bool			empty = true;
 
 	entry.MemoryType=0;
 
 	if (mystrncasecmp(argv[2],"DC",0)) entry.MemoryType=MEM_DC;
 	if (mystrncasecmp(argv[2],"ON",0)) entry.MemoryType=MEM_ON;
 	if (mystrncasecmp(argv[2],"RC",0)) entry.MemoryType=MEM_RC;
 	if (mystrncasecmp(argv[2],"MC",0)) entry.MemoryType=MEM_MC;
 	if (mystrncasecmp(argv[2],"ME",0)) entry.MemoryType=MEM_ME;
 	if (mystrncasecmp(argv[2],"SM",0)) entry.MemoryType=MEM_SM;
 	if (mystrncasecmp(argv[2],"VM",0)) entry.MemoryType=MEM_VM;
 	if (mystrncasecmp(argv[2],"FD",0)) entry.MemoryType=MEM_FD;
 	if (entry.MemoryType==0) {
 		printmsg("ERROR: unknown memory type (\"%s\")\n",argv[2]);
 		exit (-1);
 	}
 
 	GetStartStop(&start, &stop, 3, argc, argv);
 
+	if (argc > 5 && strcmp(argv[5],"")) {
+		if (mystrncasecmp(argv[5],"-nonempty",0)) {
+			empty = false;
+		} else {
+			printmsg("ERROR: unknown parameter \"%s\"\n",argv[5]);
+			exit (-1);
+		}
+	}
+
 	GSM_Init(true);
 
 	if (!strcmp(s.Phone.Data.ModelInfo->model,"3310")) {
 		if (s.Phone.Data.VerNum<=4.06) printmsg("WARNING: you will have null names in entries. Upgrade firmware in phone to higher than 4.06\n");
 	}
 
 	for (j=start;j<=stop;j++) {
-		printmsg("Memory %s, Location %i\n",argv[2],j);
+		if (empty) printmsg("Memory %s, Location %i\n",argv[2],j);
 
 		entry.Location=j;
 
 		error=Phone->GetMemory(&s, &entry);
 		if (error != ERR_EMPTY) Print_Error(error);
 
 		if (error == ERR_EMPTY) {
+			emptynum++;
+			if (empty) {
 			printmsg("Entry is empty\n");
 			printf("\n");
+			}
 		} else {
+			fillednum++;
+			if (!empty) printmsg("Memory %s, Location %i\n",argv[2],j);
 			PrintMemoryEntry(&entry);
 		}
 	}
 	
+	printmsg("%i entries empty, %i entries filled\n",emptynum,fillednum);
+	
 	GSM_Terminate();
 }
 
 #define MemoryLocationToString(x) ( \
 	x == MEM_ON ? "ON" :			\
 	x == MEM_RC ? "RC" :			\
 	x == MEM_MC ? "MC" :			\
 	x == MEM_ME ? "ME" :			\
 	x == MEM_SM ? "SM" :			\
 	x == MEM_VM ? "VM" :			\
 	x == MEM_FD ? "FD" : "XX")
 
@@ -665,25 +670,25 @@ static void SearchOneEntry(GSM_MemoryEntry *Entry, unsigned char *Text)
 			case PBK_Text_Company       :
 			case PBK_Text_JobTitle      :
 			case PBK_Text_StreetAddress :
 			case PBK_Text_City          :
 			case PBK_Text_State         :
 			case PBK_Text_Zip           :
 			case PBK_Text_Country       :
 			case PBK_Text_Custom1       :
 			case PBK_Text_Custom2       :
 			case PBK_Text_Custom3       :
 			case PBK_Text_Custom4       :
 			case PBK_Caller_Group       :
-				if (mystrstr(Entry->Entries[i].Text, Text) != NULL) {
+				if (mywstrstr(Entry->Entries[i].Text, Text) != NULL) {
 					fprintf(stderr,"\n");
 					printmsg("Memory %s, Location %i\n",MemoryLocationToString(Entry->MemoryType),Entry->Location);
 					PrintMemoryEntry(Entry);
 					return;
 				}
 				break;
 			default:
 				break;
 		}
 	}
 }	
 
@@ -815,48 +820,48 @@ static void ListMemoryCategory(int argc, char *argv[])
 		EncodeUnicode(Text, argv[2], Length);
 
 		Category.Type 	= Category_Phonebook;
 		Status.Type 	= Category_Phonebook;
 		
 		if (Phone->GetCategoryStatus(&s, &Status) == ERR_NONE) {
 			for (count=0,j=1;count<Status.Used;j++) {
 				Category.Location=j;
 				error=Phone->GetCategory(&s, &Category);
 			
 				if (error != ERR_EMPTY) {
 					count++;
-					if (mystrstr(Category.Name, Text) != NULL) {
+					if (mywstrstr(Category.Name, Text) != NULL) {
 						ListMemoryCategoryEntries(j);
 					}
 				}
 			}
 		}
 	}
 	GSM_Terminate();
 }
 
 static void displaysinglesmsinfo(GSM_SMSMessage sms, bool displaytext, bool displayudh)
 {
 	switch (sms.PDU) {
 	case SMS_Status_Report:
 		printmsg("SMS status report\n");
 		printmsg("Status          : ");
 		switch (sms.State) {
 			case SMS_Sent	: printmsg("Sent");	break;
 			case SMS_Read	: printmsg("Read");	break;
 			case SMS_UnRead	: printmsg("UnRead");	break;
 			case SMS_UnSent	: printmsg("UnSent");	break;
 		}
 		printmsg("\nRemote number   : \"%s\"\n",DecodeUnicodeConsole(sms.Number));
-		printmsg("Reference number: 0x%02X\n",sms.MessageReference);
+		printmsg("Reference number: %d\n",sms.MessageReference);
 		printmsg("Sent            : %s\n",OSDateTime(sms.DateTime,true));
 		printmsg("SMSC number     : \"%s\"\n",DecodeUnicodeConsole(sms.SMSC.Number));
 		printmsg("SMSC response   : %s\n",OSDateTime(sms.SMSCTime,true));
 		printmsg("Delivery status : %s\n",DecodeUnicodeConsole(sms.Text));
 		printmsg("Details         : ");
 		if (sms.DeliveryStatus & 0x40) {
 			if (sms.DeliveryStatus & 0x20) {
 				printmsg("Temporary error, ");
 			} else {
 	     			printmsg("Permanent error, ");
 			}
 	    	} else if (sms.DeliveryStatus & 0x20) {
@@ -885,58 +890,68 @@ static void displaysinglesmsinfo(GSM_SMSMessage sms, bool displaytext, bool disp
 		        case 0x60: printmsg("Congestion");					break;
 		        case 0x61: printmsg("SME busy");					break;
 		        case 0x62: printmsg("No response from SME");				break;
 		        case 0x63: printmsg("Service rejected");				break;
 		        case 0x64: printmsg("Quality of service not available");		break;
 		        case 0x65: printmsg("Error in SME");					break;
 		        default  : printmsg("Reserved/Specific to SC: %x",sms.DeliveryStatus);	break;
 		}
 		printf("\n");
 		break;
 	case SMS_Deliver:
 		printmsg("SMS message\n");
+		if (sms.State==SMS_UnSent && sms.Memory==MEM_ME) {
+			printmsg("Saved            : %s\n",OSDateTime(sms.DateTime,true));
+		} else {
 		printmsg("SMSC number      : \"%s\"",DecodeUnicodeConsole(sms.SMSC.Number));
 		if (sms.ReplyViaSameSMSC) printmsg(" (set for reply)");
 		printmsg("\nSent             : %s\n",OSDateTime(sms.DateTime,true));
+		}
 		/* No break. The only difference for SMS_Deliver and SMS_Submit is,
 		 * that SMS_Deliver contains additional data. We wrote them and then go
 		 * for data shared with SMS_Submit
 		 */
 	case SMS_Submit:
 		if (sms.ReplaceMessage != 0) printmsg("SMS replacing ID : %i\n",sms.ReplaceMessage);
 		/* If we went here from "case SMS_Deliver", we don't write "SMS Message" */
 		if (sms.PDU==SMS_Submit) {
 			printmsg("SMS message\n");
-			printmsg("Reference number : 0x%02X\n",sms.MessageReference);
+			if (sms.State==SMS_UnSent && sms.Memory==MEM_ME) {
+			} else {
+				printmsg("Reference number : %d\n",sms.MessageReference);
+			}
 		}
 		if (sms.Name[0] != 0x00 || sms.Name[1] != 0x00) {
 			printmsg("Name             : \"%s\"\n",DecodeUnicodeConsole(sms.Name));
 		}
 		if (sms.Class != -1) {
 			printmsg("Class            : %i\n",sms.Class);
 		}
 		printmsg("Coding           : ");
 		switch (sms.Coding) {
 			case SMS_Coding_Unicode : printmsg("Unicode\n");		break;
 			case SMS_Coding_Default : printmsg("Default GSM alphabet\n");	break;
 			case SMS_Coding_8bit	: printmsg("8 bit\n");			break;
 		}
+		if (sms.State==SMS_UnSent && sms.Memory==MEM_ME) {
+		} else {
+			printmsg("Remote number    : \"%s\"\n",DecodeUnicodeConsole(sms.Number));
+		}
 		printmsg("Status           : ");
 		switch (sms.State) {
-			case SMS_Sent	:	printmsg("Sent");	break;
-			case SMS_Read	:	printmsg("Read");	break;
-			case SMS_UnRead	:	printmsg("UnRead");	break;
-			case SMS_UnSent	:	printmsg("UnSent");	break;
+			case SMS_Sent	:	printmsg("Sent\n");	break;
+			case SMS_Read	:	printmsg("Read\n");	break;
+			case SMS_UnRead	:	printmsg("UnRead\n");	break;
+			case SMS_UnSent	:	printmsg("UnSent\n");	break;
 		}
-		printmsg("\nRemote number    : \"%s\"\n",DecodeUnicodeConsole(sms.Number));
 		if (sms.UDH.Type != UDH_NoUDH) {
 			printmsg("User Data Header : ");
 			switch (sms.UDH.Type) {
 			case UDH_ConcatenatedMessages	   : printmsg("Concatenated (linked) message"); 	 break;
 			case UDH_ConcatenatedMessages16bit : printmsg("Concatenated (linked) message"); 	 break;
 			case UDH_DisableVoice		   : printmsg("Disables voice indicator");	 	 break;
 			case UDH_EnableVoice		   : printmsg("Enables voice indicator");	 	 break;
 			case UDH_DisableFax		   : printmsg("Disables fax indicator");	 	 break;
 			case UDH_EnableFax		   : printmsg("Enables fax indicator");	 		 break;
 			case UDH_DisableEmail		   : printmsg("Disables email indicator");	 	 break;
 			case UDH_EnableEmail		   : printmsg("Enables email indicator");	 	 break;
 			case UDH_VoidSMS		   : printmsg("Void SMS");			 	 break;
@@ -969,25 +984,25 @@ static void displaysinglesmsinfo(GSM_SMSMessage sms, bool displaytext, bool disp
 		}
 		if (displaytext) {
 			printf("\n");
 			if (sms.Coding!=SMS_Coding_8bit) {
 				printmsg("%s\n",DecodeUnicodeConsole(sms.Text));
 			} else {
 				printmsg("8 bit SMS, cannot be displayed here\n");
 			}
 		}
 		break;
 	}
 }
-//#if 0
+
 static void displaymultismsinfo (GSM_MultiSMSMessage sms, bool eachsms, bool ems)
 {
 	GSM_MultiPartSMSInfo	SMSInfo;
 	bool				RetVal,udhinfo=true;
 	int				j;
 
 	/* GSM_DecodeMultiPartSMS returns if decoded SMS contenst correctly */
 	RetVal = GSM_DecodeMultiPartSMS(&SMSInfo,&sms,ems);
 
 	if (eachsms) {
 		if (sms.SMS[0].UDH.Type != UDH_NoUDH && sms.SMS[0].UDH.AllParts == sms.Number) udhinfo = false;
 		if (RetVal && !udhinfo) {
@@ -1276,32 +1291,39 @@ static void Monitor(int argc, char *argv[])
 					printmsg("Name in phone     : \"%s\"\n",DecodeUnicodeConsole(NetInfo.NetworkName));
 				}
 			}
 		}
 		printf("\n");
 	}
 
 	printmsg("Leaving monitor mode...\n");
 
 	GSM_Terminate();
 }
 
+static void IncomingUSSD2(char *Device, char *Buffer)
+{
+	printmsg("Service reply: \"%s\"\n",DecodeUnicodeConsole(Buffer));
+
+	gshutdown = true;
+}
+
 static void GetUSSD(int argc, char *argv[])
 {
 	GSM_Init(true);
 
 	signal(SIGINT, interrupt);
 	printmsgerr("Press Ctrl+C to break...\n");
 
-	s.User.IncomingUSSD = IncomingUSSD;
+	s.User.IncomingUSSD = IncomingUSSD2;
 
 	error=Phone->SetIncomingUSSD(&s,true);
 	Print_Error(error);
 
 	error=Phone->DialVoice(&s, argv[2], GSM_CALL_DefaultNumberPresence);
 	Print_Error(error);
 
 	while (!gshutdown) GSM_ReadDevice(&s,true);
 
 	GSM_Terminate();
 }
 
@@ -1336,25 +1358,34 @@ static void GetSMSC(int argc, char *argv[])
 			case SMS_FORMAT_Pager	: printmsg("Pager");	break;
 		}
 		printf("\n");
 
 		printmsg("Validity       : ");
 		switch (smsc.Validity.Relative) {
 			case SMS_VALID_1_Hour	: printmsg("1 hour");	    break;
 			case SMS_VALID_6_Hours 	: printmsg("6 hours");	    break;
 			case SMS_VALID_1_Day	: printmsg("24 hours");	    break;
 			case SMS_VALID_3_Days	: printmsg("72 hours");	    break;
 			case SMS_VALID_1_Week  	: printmsg("1 week"); 	    break;
 			case SMS_VALID_Max_Time	: printmsg("Maximum time"); break;
-			default           	: printmsg("Unknown");
+			default           	:
+				if (smsc.Validity.Relative >= 0 && smsc.Validity.Relative <= 143) {
+					printmsg("%i minutes",(smsc.Validity.Relative+1)*5);
+				} else if (smsc.Validity.Relative >= 144 && smsc.Validity.Relative <= 167) {
+					printmsg("%i minutes",12*60 + (smsc.Validity.Relative-143)*30);
+				} else if (smsc.Validity.Relative >= 168 && smsc.Validity.Relative <= 196) {
+					printmsg("%i days",smsc.Validity.Relative-166);
+				} else if (smsc.Validity.Relative >= 197 && smsc.Validity.Relative <= 255) {
+					printmsg("%i weeks",smsc.Validity.Relative-192);
+				}
 		}
 		printf("\n");
 	}
 
 	GSM_Terminate();
 }
 
 static void GetSMS(int argc, char *argv[])
 {
 	GSM_MultiSMSMessage	sms;
 	GSM_SMSFolders		folders;
 	int			start, stop;
@@ -1419,45 +1450,43 @@ static void DeleteSMS(int argc, char *argv[])
 
 static void GetAllSMS(int argc, char *argv[])
 {
 	GSM_MultiSMSMessage 	sms;
 	GSM_SMSFolders		folders;
 	bool			start = true;
 
 	GSM_Init(true);
 
 	error=Phone->GetSMSFolders(&s, &folders);
 	Print_Error(error);
 
-	fprintf(stderr,"Reading: ");
 	while (error == ERR_NONE) {
 		sms.SMS[0].Folder=0x00;
 		error=Phone->GetNextSMS(&s, &sms, start);
 		switch (error) {
 		case ERR_EMPTY:
 			break;
 		default:
 			Print_Error(error);
 			printmsg("Location %i, folder \"%s\"",sms.SMS[0].Location,DecodeUnicodeConsole(folders.Folder[sms.SMS[0].Folder-1].Name));
 			switch(sms.SMS[0].Memory) {
 				case MEM_SM: printmsg(", SIM memory"); 		break;
 				case MEM_ME: printmsg(", phone memory"); 	break;
 				case MEM_MT: printmsg(", phone or SIM memory"); break;
 				default    : break;
 			}
 			if (sms.SMS[0].InboxFolder) printmsg(", Inbox folder");
 			printf("\n");
 			displaymultismsinfo(sms,false,false);
 		}
-		fprintf(stderr,"*");
 		start=false;
 	}
 	fprintf(stderr,"\n");
 
 #ifdef GSM_ENABLE_BEEP
 	GSM_PhoneBeep();
 #endif
 	GSM_Terminate();
 }
 
 static void GetEachSMS(int argc, char *argv[])
 {
@@ -1570,25 +1599,26 @@ static void GetRingtone(int argc, char *argv[])
 	GetStartStop(&ringtone.Location, NULL, 2, argc, argv);
 
 	GSM_Init(true);
 
 	ringtone.Format=0;
 
 	error=Phone->GetRingtone(&s,&ringtone,PhoneRingtone);
 	Print_Error(error);
 
 	switch (ringtone.Format) {
 		case RING_NOTETONE	: printmsg("Smart Messaging");	break;
 		case RING_NOKIABINARY	: printmsg("Nokia binary");	break;
-		case RING_MIDI		: printmsg("Midi format");	break;
+		case RING_MIDI		: printmsg("MIDI");		break;
+		case RING_MMF		: printmsg("SMAF (MMF)");	break;
 	}
 	printmsg(" format, ringtone \"%s\"\n",DecodeUnicodeConsole(ringtone.Name));
 
 	if (argc==4) {
 		error=GSM_SaveRingtoneFile(argv[3], &ringtone);
 		Print_Error(error);
 	}
 
 	GSM_Terminate();
 }
 
 static void GetRingtonesList(int argc, char *argv[])
@@ -2033,26 +2063,26 @@ static void GetAllCalendar(int argc, char *argv[])
 {
 	GSM_CalendarEntry	Note;
 	bool			refresh	= true;
 
 	signal(SIGINT, interrupt);
 	printmsgerr("Press Ctrl+C to break...\n");
 
 	GSM_Init(true);
 
 	while (!gshutdown) {
 		error=Phone->GetNextCalendar(&s,&Note,refresh);
 		if (error == ERR_EMPTY) break;
-		PrintCalendar(&Note);
 		Print_Error(error);
+		PrintCalendar(&Note);
 		refresh=false;
 	}
 
 	GSM_Terminate();
 }
 
 static void GetCalendarSettings(int argc, char *argv[])
 {
 	GSM_CalendarSettings settings;
 
 	GSM_Init(true);
 
@@ -2233,24 +2263,26 @@ static void GetBitmap(int argc, char *argv[])
 	case GSM_OperatorLogo:
 		if (strcmp(MultiBitmap.Bitmap[0].NetworkCode,"000 00")!=0) {
 			GSM_PrintBitmap(stdout,&MultiBitmap.Bitmap[0]);
 			if (argc>3) error=GSM_SaveBitmapFile(argv[3],&MultiBitmap);
 		} else {
 			printmsg("No operator logo in phone\n");
 		}
 		break;
 	case GSM_PictureImage:
 		GSM_PrintBitmap(stdout,&MultiBitmap.Bitmap[0]);
 		printmsg("Text   : \"%s\"\n",DecodeUnicodeConsole(MultiBitmap.Bitmap[0].Text));
 		printmsg("Sender : \"%s\"\n",DecodeUnicodeConsole(MultiBitmap.Bitmap[0].Sender));
+		if (MultiBitmap.Bitmap[0].Name)
+			printmsg("Name   : \"%s\"\n",DecodeUnicodeConsole(MultiBitmap.Bitmap[0].Name));
 		if (argc>4) error=GSM_SaveBitmapFile(argv[4],&MultiBitmap);
 		break;
 	case GSM_WelcomeNote_Text:
 		printmsg("Welcome note text is \"%s\"\n",DecodeUnicodeConsole(MultiBitmap.Bitmap[0].Text));
 		break;
 	case GSM_DealerNote_Text:
 		printmsg("Dealer note text is \"%s\"\n",DecodeUnicodeConsole(MultiBitmap.Bitmap[0].Text));
 		break;
 	default:
 		break;
 	}
 	Print_Error(error);
@@ -2496,36 +2528,36 @@ static void DisplaySMSFrame(GSM_SMSMessage *SMS)
 	req[current++]=buffer[PHONE_SMSSubmit.TPDCS];
 	req[current++]=buffer[PHONE_SMSSubmit.TPVP];
 	req[current++]=buffer[PHONE_SMSSubmit.TPUDL];
 	for(i=0;i<length;i++) req[current++]=buffer[PHONE_SMSSubmit.Text+i];
 	EncodeHexBin(hexreq, req, current);
 	printmsg("%s\n\n",hexreq);
 #endif
 }
 
 #define SEND_SAVE_SMS_BUFFER_SIZE 10000
 
 static GSM_Error SMSStatus;
-//#if 0
+
 static void SendSMSStatus (char *Device, int status, int MessageReference)
 {
 	dbgprintf("Sent SMS on device: \"%s\"\n",Device);
 	if (status==0) {
 		printmsg("..OK");
 		SMSStatus = ERR_NONE;
 	} else {
 		printmsg("..error %i",status);
 		SMSStatus = ERR_UNKNOWN;
 	}
-	printmsg(", message reference=%02x\n",MessageReference);
+	printmsg(", message reference=%d\n",MessageReference);
 }
 
 static void SendSaveDisplaySMS(int argc, char *argv[])
 {
 #ifdef GSM_ENABLE_BACKUP
 	GSM_Backup			Backup;
 #endif
 	int				i,j,z,FramesNum = 0;
 	int				Protected = 0;
 	GSM_SMSFolders			folders;
 	GSM_MultiSMSMessage		sms;
 	GSM_Ringtone			ringtone[MAX_MULTI_SMS];
@@ -2565,25 +2597,29 @@ static void SendSaveDisplaySMS(int argc, char *argv[])
 	SMSInfo.EntriesNum		= 1;
 
 	if (mystrncasecmp(argv[1],"--savesms",0)) {
 		EncodeUnicode(Sender,"Gammu",5);
 		Name[0]  	= 0;
 		Name[1]  	= 0;
 		startarg 	= 0;
 	} else {
 		EncodeUnicode(Sender,argv[3],strlen(argv[3]));
 		startarg 	= 1;
 		Validity.Format = 0;
 	}
-	if (mystrncasecmp(argv[1],"--sendsmsdsms",0)) startarg=startarg+2;
+	if (mystrncasecmp(argv[1],"--sendsmsdsms",0)) {
+		startarg=startarg+2;
+		EncodeUnicode(SMSC,"1234",4);
+		SMSCSet	= 0;
+	}
 
 	if (mystrncasecmp(argv[2],"TEXT",0)) {
 		chars_read = fread(InputBuffer, 1, SEND_SAVE_SMS_BUFFER_SIZE/2, stdin);
 		if (chars_read == 0) printmsg("Warning: 0 chars read !\n");	
 		InputBuffer[chars_read] 		= 0x00;	
 		InputBuffer[chars_read+1] 		= 0x00;	
 		EncodeUnicode(Buffer[0],InputBuffer,strlen(InputBuffer));
 		SMSInfo.Entries[0].Buffer  		= Buffer[0];
 		SMSInfo.Entries[0].ID			= SMS_Text;
 		SMSInfo.UnicodeCoding   		= false;
 		startarg += 3;
 	} else if (mystrncasecmp(argv[2],"SMSTEMPLATE",0)) {
@@ -2591,36 +2627,49 @@ static void SendSaveDisplaySMS(int argc, char *argv[])
 		SMSInfo.EntriesNum 			= 1;
 		Buffer[0][0]				= 0x00;
 		Buffer[0][1]				= 0x00;
 		SMSInfo.Entries[0].Buffer  		= Buffer[0];
 		SMSInfo.Entries[0].ID			= SMS_AlcatelSMSTemplateName;
 		startarg += 3;
 	} else if (mystrncasecmp(argv[2],"EMS",0)) {
 		SMSInfo.UnicodeCoding   		= false;
 		SMSInfo.EntriesNum 			= 0;
 		startarg += 3;
 	} else if (mystrncasecmp(argv[2],"MMSINDICATOR",0)) {
 		if (argc<6+startarg) {
-			printmsg("Where is ringtone filename ?\n");
+			printmsg("Where are parameters ?\n");
 			exit(-1);
 		}
 		SMSInfo.Entries[0].ID 	 	= SMS_MMSIndicatorLong;
 		SMSInfo.Entries[0].MMSIndicator = &MMSInfo;
 		if (mystrncasecmp(argv[1],"--savesms",0)) {
 			EncodeUnicode(Sender,"MMS Info",8);
 		}
 		strcpy(MMSInfo.Address,	argv[3+startarg]);
 		strcpy(MMSInfo.Title,	argv[4+startarg]);
 		strcpy(MMSInfo.Sender,	argv[5+startarg]);
 		startarg += 6;
+	} else if (mystrncasecmp(argv[2],"WAPINDICATOR",0)) {
+		if (argc<5+startarg) {
+			printmsg("Where are parameters ?\n");
+			exit(-1);
+		}
+		SMSInfo.Entries[0].ID 	 	= SMS_WAPIndicatorLong;
+		SMSInfo.Entries[0].MMSIndicator = &MMSInfo;
+		if (mystrncasecmp(argv[1],"--savesms",0)) {
+			EncodeUnicode(Sender,"WAP Info",8);
+		}
+		strcpy(MMSInfo.Address,	argv[3+startarg]);
+		strcpy(MMSInfo.Title,	argv[4+startarg]);
+		startarg += 5;
 	} else if (mystrncasecmp(argv[2],"RINGTONE",0)) {
 		if (argc<4+startarg) {
 			printmsg("Where is ringtone filename ?\n");
 			exit(-1);
 		}
 		ringtone[0].Format=RING_NOTETONE;
 		error=GSM_ReadRingtoneFile(argv[3+startarg],&ringtone[0]);
 		Print_Error(error);
 		SMSInfo.Entries[0].ID 	 = SMS_NokiaRingtone;
 		SMSInfo.Entries[0].Ringtone = &ringtone[0];
 		if (mystrncasecmp(argv[1],"--savesms",0)) {
 			CopyUnicodeString(Sender, ringtone[0].Name);
@@ -2701,48 +2750,48 @@ static void SendSaveDisplaySMS(int argc, char *argv[])
 		if (mystrncasecmp(argv[1],"--savesms",0)) {
 			EncodeUnicode(Sender, "Picture",7);
 			EncodeUnicode(Name,"Picture Image",13);
 		}
 		startarg += 4;
 #ifdef GSM_ENABLE_BACKUP
 	} else if (mystrncasecmp(argv[2],"BOOKMARK",0)) {
 		if (argc<5+startarg) {
 			printmsg("Where is backup filename and location ?\n");
 			exit(-1);
 		}
 		error=GSM_ReadBackupFile(argv[3+startarg],&Backup);
-		Print_Error(error);
+		if (error!=ERR_NOTIMPLEMENTED) Print_Error(error);
 		i = 0;
 		while (Backup.WAPBookmark[i]!=NULL) {
 			if (i == atoi(argv[4+startarg])-1) break;
 			i++;
 		}
 		if (i != atoi(argv[4+startarg])-1) {
 			printmsg("Bookmark not found in file\n");
 			exit(-1);
 		}
 		SMSInfo.Entries[0].ID 	    = SMS_NokiaWAPBookmarkLong;
 		SMSInfo.Entries[0].Bookmark = Backup.WAPBookmark[i];		
 		if (mystrncasecmp(argv[1],"--savesms",0)) {
 			EncodeUnicode(Sender, "Bookmark",8);
 			EncodeUnicode(Name,"WAP Bookmark",12);
 		}
 		startarg += 5;
 	} else if (mystrncasecmp(argv[2],"WAPSETTINGS",0)) {
 		if (argc<6+startarg) {
 			printmsg("Where is backup filename and location ?\n");
 			exit(-1);
 		}
 		error=GSM_ReadBackupFile(argv[3+startarg],&Backup);
-		Print_Error(error);
+		if (error!=ERR_NOTIMPLEMENTED) Print_Error(error);
 		i = 0;
 		while (Backup.WAPSettings[i]!=NULL) {
 			if (i == atoi(argv[4+startarg])-1) break;
 			i++;
 		}
 		if (i != atoi(argv[4+startarg])-1) {
 			printmsg("WAP settings not found in file\n");
 			exit(-1);
 		}
 		SMSInfo.Entries[0].Settings = NULL;
 		for (j=0;j<Backup.WAPSettings[i]->Number;j++) {
 			switch (Backup.WAPSettings[i]->Settings[j].Bearer) {
@@ -2767,25 +2816,25 @@ static void SendSaveDisplaySMS(int argc, char *argv[])
 		SMSInfo.Entries[0].ID = SMS_NokiaWAPSettingsLong;
 		if (mystrncasecmp(argv[1],"--savesms",0)) {
 			EncodeUnicode(Sender, "Settings",8);
 			EncodeUnicode(Name,"WAP Settings",12);
 		}
 		startarg += 6;
 	} else if (mystrncasecmp(argv[2],"MMSSETTINGS",0)) {
 		if (argc<5+startarg) {
 			printmsg("Where is backup filename and location ?\n");
 			exit(-1);
 		}
 		error=GSM_ReadBackupFile(argv[3+startarg],&Backup);
-		Print_Error(error);
+		if (error!=ERR_NOTIMPLEMENTED) Print_Error(error);
 		i = 0;
 		while (Backup.MMSSettings[i]!=NULL) {
 			if (i == atoi(argv[4+startarg])-1) break;
 			i++;
 		}
 		if (i != atoi(argv[4+startarg])-1) {
 			printmsg("MMS settings not found in file\n");
 			exit(-1);
 		}
 		SMSInfo.Entries[0].Settings = NULL;
 		for (j=0;j<Backup.MMSSettings[i]->Number;j++) {
 			switch (Backup.MMSSettings[i]->Settings[j].Bearer) {
@@ -2803,69 +2852,69 @@ static void SendSaveDisplaySMS(int argc, char *argv[])
 		SMSInfo.Entries[0].ID = SMS_NokiaMMSSettingsLong;
 		if (mystrncasecmp(argv[1],"--savesms",0)) {
 			EncodeUnicode(Sender, "Settings",8);
 			EncodeUnicode(Name,"MMS Settings",12);
 		}
 		startarg += 5;
 	} else if (mystrncasecmp(argv[2],"CALENDAR",0)) {
 		if (argc<5+startarg) {
 			printmsg("Where is backup filename and location ?\n");
 			exit(-1);
 		}
 		error=GSM_ReadBackupFile(argv[3+startarg],&Backup);
-		Print_Error(error);
+		if (error!=ERR_NOTIMPLEMENTED) Print_Error(error);
 		i = 0;
 		while (Backup.Calendar[i]!=NULL) {
 			if (i == atoi(argv[4+startarg])-1) break;
 			i++;
 		}
 		if (i != atoi(argv[4+startarg])-1) {
 			printmsg("Calendar note not found in file\n");
 			exit(-1);
 		}
 		SMSInfo.Entries[0].ID 	    = SMS_NokiaVCALENDAR10Long;
 		SMSInfo.Entries[0].Calendar = Backup.Calendar[i];		
 		if (mystrncasecmp(argv[1],"--savesms",0)) {
 			EncodeUnicode(Sender, "Calendar",8);
 		}
 		startarg += 5;
 	} else if (mystrncasecmp(argv[2],"TODO",0)) {
 		if (argc<5+startarg) {
 			printmsg("Where is backup filename and location ?\n");
 			exit(-1);
 		}
 		error=GSM_ReadBackupFile(argv[3+startarg],&Backup);
-		Print_Error(error);
+		if (error!=ERR_NOTIMPLEMENTED) Print_Error(error);
 		i = 0;
 		while (Backup.ToDo[i]!=NULL) {
 			if (i == atoi(argv[4+startarg])-1) break;
 			i++;
 		}
 		if (i != atoi(argv[4+startarg])-1) {
 			printmsg("ToDo note not found in file\n");
 			exit(-1);
 		}
 		SMSInfo.Entries[0].ID 	 	= SMS_NokiaVTODOLong;
 		SMSInfo.Entries[0].ToDo 	= Backup.ToDo[i];		
 		if (mystrncasecmp(argv[1],"--savesms",0)) {
 			EncodeUnicode(Sender, "ToDo",8);
 		}
 		startarg += 5;
 	} else if (mystrncasecmp(argv[2],"VCARD10",0) || mystrncasecmp(argv[2],"VCARD21",0)) {
 		if (argc<6+startarg) {
 			printmsg("Where is backup filename and location and memory type ?\n");
 			exit(-1);
 		}
 		error=GSM_ReadBackupFile(argv[3+startarg],&Backup);
-		Print_Error(error);
+		if (error!=ERR_NOTIMPLEMENTED) Print_Error(error);
 		i = 0;
 		if (mystrncasecmp(argv[4+startarg],"SM",0)) {
 			while (Backup.SIMPhonebook[i]!=NULL) {
 				if (i == atoi(argv[5+startarg])-1) break;
 				i++;
 			}
 			if (i != atoi(argv[5+startarg])-1) {
 				printmsg("Phonebook entry not found in file\n");
 				exit(-1);
 			}
 			SMSInfo.Entries[0].Phonebook = Backup.SIMPhonebook[i];
 		} else if (mystrncasecmp(argv[4+startarg],"ME",0)) {
@@ -3800,97 +3849,97 @@ static void SaveFile(int argc, char *argv[])
 	GSM_Backup		Backup;
 	int			i,j;
 	FILE			*file;
 	unsigned char		Buffer[10000];
 	GSM_MemoryEntry		*pbk;
 
 	if (mystrncasecmp(argv[2],"CALENDAR",0)) {
 		if (argc<5) {
 			printmsg("Where is backup filename and location ?\n");
 			exit(-1);
 		}
 		error=GSM_ReadBackupFile(argv[4],&Backup);
-		Print_Error(error);
+		if (error!=ERR_NOTIMPLEMENTED) Print_Error(error);
 		i = 0;
 		while (Backup.Calendar[i]!=NULL) {
 			if (i == atoi(argv[5])-1) break;
 			i++;
 		}
 		if (i != atoi(argv[5])-1) {
 			printmsg("Calendar note not found in file\n");
 			exit(-1);
 		}
 		j = 0;
 		GSM_EncodeVCALENDAR(Buffer, &j, Backup.Calendar[i],true,Nokia_VCalendar);
 	} else if (mystrncasecmp(argv[2],"BOOKMARK",0)) {
 		if (argc<5) {
 			printmsg("Where is backup filename and location ?\n");
 			exit(-1);
 		}
 		error=GSM_ReadBackupFile(argv[4],&Backup);
-		Print_Error(error);
+		if (error!=ERR_NOTIMPLEMENTED) Print_Error(error);
 		i = 0;
 		while (Backup.WAPBookmark[i]!=NULL) {
 			if (i == atoi(argv[5])-1) break;
 			i++;
 		}
 		if (i != atoi(argv[5])-1) {
 			printmsg("WAP bookmark not found in file\n");
 			exit(-1);
 		}
 		j = 0;
 		GSM_EncodeURLFile(Buffer, &j, Backup.WAPBookmark[i]);
 	} else if (mystrncasecmp(argv[2],"NOTE",0)) {
 		if (argc<5) {
 			printmsg("Where is backup filename and location ?\n");
 			exit(-1);
 		}
 		error=GSM_ReadBackupFile(argv[4],&Backup);
-		Print_Error(error);
+		if (error!=ERR_NOTIMPLEMENTED) Print_Error(error);
 		i = 0;
 		while (Backup.Note[i]!=NULL) {
 			if (i == atoi(argv[5])-1) break;
 			i++;
 		}
 		if (i != atoi(argv[5])-1) {
 			printmsg("Note not found in file\n");
 			exit(-1);
 		}
 		j = 0;
 		GSM_EncodeVNTFile(Buffer, &j, Backup.Note[i]);
 	} else if (mystrncasecmp(argv[2],"TODO",0)) {
 		if (argc<5) {
 			printmsg("Where is backup filename and location ?\n");
 			exit(-1);
 		}
 		error=GSM_ReadBackupFile(argv[4],&Backup);
-		Print_Error(error);
+		if (error!=ERR_NOTIMPLEMENTED) Print_Error(error);
 		i = 0;
 		while (Backup.ToDo[i]!=NULL) {
 			if (i == atoi(argv[5])-1) break;
 			i++;
 		}
 		if (i != atoi(argv[5])-1) {
 			printmsg("ToDo note not found in file\n");
 			exit(-1);
 		}
 		j = 0;
 		GSM_EncodeVTODO(Buffer, &j, Backup.ToDo[i], true, Nokia_VToDo);
 	} else if (mystrncasecmp(argv[2],"VCARD10",0) || mystrncasecmp(argv[2],"VCARD21",0)) {
 		if (argc<6) {
 			printmsg("Where is backup filename and location and memory type ?\n");
 			exit(-1);
 		}
 		error=GSM_ReadBackupFile(argv[4],&Backup);
-		Print_Error(error);
+		if (error!=ERR_NOTIMPLEMENTED) Print_Error(error);
 		i = 0;
 		if (mystrncasecmp(argv[5],"SM",0)) {
 			while (Backup.SIMPhonebook[i]!=NULL) {
 				if (i == atoi(argv[6])-1) break;
 				i++;
 			}
 			if (i != atoi(argv[6])-1) {
 				printmsg("Phonebook entry not found in file\n");
 				exit(-1);
 			}
 			pbk = Backup.SIMPhonebook[i];
 		} else if (mystrncasecmp(argv[5],"ME",0)) {
@@ -3921,32 +3970,35 @@ static void SaveFile(int argc, char *argv[])
 	file = fopen(argv[3],"wb");
 	fwrite(Buffer,1,j,file);
 	fclose(file);
 }
 
 static void Backup(int argc, char *argv[])
 {
 	int			i, used;
 	GSM_MemoryStatus	MemStatus;
 	GSM_ToDoEntry		ToDo;
 	GSM_ToDoStatus		ToDoStatus;
 	GSM_MemoryEntry		Pbk;
-	GSM_CalendarEntry	Note;
+	GSM_CalendarEntry	Calendar;
 	GSM_Bitmap		Bitmap;
 	GSM_WAPBookmark		Bookmark;
 	GSM_Profile		Profile;
 	GSM_MultiWAPSettings	Settings;
+	GSM_SyncMLSettings	SyncML;
+	GSM_ChatSettings	Chat;
 	GSM_Ringtone		Ringtone;
 	GSM_SMSC		SMSC;
 	GSM_Backup		Backup;
+	GSM_NoteEntry		Note;
 	GSM_Backup_Info		Info;
  	GSM_FMStation		FMStation;
  	GSM_GPRSAccessPoint	GPRSPoint;
 	bool			DoBackup;
 
 	if (argc == 4 && mystrncasecmp(argv[3],"-yes",0)) always_answer_yes = true;
 
 	GSM_ClearBackup(&Backup);
 	GSM_GetBackupFormatFeatures(argv[2],&Info);
 
 	sprintf(Backup.Creator,"Gammu %s",VERSION);
 	if (strlen(GetOS()) != 0) {
@@ -4065,45 +4117,45 @@ static void Backup(int argc, char *argv[])
 			printmsgerr("%c   Reading: %i percent",13,used*100/MemStatus.MemoryUsed);
 			i++;
 			if (gshutdown) {
 				GSM_Terminate();
 				exit(0);
 			}
 		}
 		printmsgerr("\n");
 	}
 	DoBackup = false;
 	if (Info.Calendar) {
 		printmsg("Checking calendar\n");
-		error=Phone->GetNextCalendar(&s,&Note,true);
+		error=Phone->GetNextCalendar(&s,&Calendar,true);
 		if (error==ERR_NONE) {
 			if (answer_yes("   Backup calendar notes")) DoBackup = true;
 		}
 	}
 	if (DoBackup) {
 		used 		= 0;
 		printmsgerr("   Reading : ");
 		while (error == ERR_NONE) {
 			if (used < GSM_MAXCALENDARTODONOTES) {
 				Backup.Calendar[used] = malloc(sizeof(GSM_CalendarEntry));
 			        if (Backup.Calendar[used] == NULL) Print_Error(ERR_MOREMEMORY);
 				Backup.Calendar[used+1] = NULL;
 			} else {
 				printmsg("   Increase %s\n" , "GSM_MAXCALENDARTODONOTES");
 				GSM_Terminate();
 				exit(-1);
 			}
-			*Backup.Calendar[used]=Note;
+			*Backup.Calendar[used]=Calendar;
 			used ++;
-			error=Phone->GetNextCalendar(&s,&Note,false);
+			error=Phone->GetNextCalendar(&s,&Calendar,false);
 			printmsgerr("*");
 			if (gshutdown) {
 				GSM_Terminate();
 				exit(0);
 			}
 		}
 		printmsgerr("\n");
 	}
 	DoBackup = false;
 	if (Info.ToDo) {
 		printmsg("Checking ToDo\n");
 		error=Phone->GetToDoStatus(&s,&ToDoStatus);
@@ -4127,24 +4179,56 @@ static void Backup(int argc, char *argv[])
 			*Backup.ToDo[used]=ToDo;
 			used ++;
 			error=Phone->GetNextToDo(&s,&ToDo,false);
 			printmsgerr("%c   Reading: %i percent",13,used*100/ToDoStatus.Used);
 			if (gshutdown) {
 				GSM_Terminate();
 				exit(0);
 			}
 		}
 		printmsgerr("\n");
 	}
 	DoBackup = false;
+	if (Info.Note) {
+		printmsg("Checking notes\n");
+		error=Phone->GetNextNote(&s,&Note,true);
+		if (error==ERR_NONE) {
+			if (answer_yes("   Backup notes")) DoBackup = true;
+		}
+	}
+	if (DoBackup) {
+		used 		= 0;
+		printmsgerr("   Reading : ");
+		while (error == ERR_NONE) {
+			if (used < GSM_BACKUP_MAX_NOTE) {
+				Backup.Note[used] = malloc(sizeof(GSM_NoteEntry));
+			        if (Backup.Note[used] == NULL) Print_Error(ERR_MOREMEMORY);
+				Backup.Note[used+1] = NULL;
+			} else {
+				printmsg("   Increase %s\n" , "GSM_BACKUP_MAX_NOTE");
+				GSM_Terminate();
+				exit(-1);
+			}
+			*Backup.Note[used]=Note;
+			used ++;
+			error=Phone->GetNextNote(&s,&Note,false);
+			printmsgerr("*");
+			if (gshutdown) {
+				GSM_Terminate();
+				exit(0);
+			}
+		}
+		printmsgerr("\n");
+	}
+	DoBackup = false;
 	if (Info.CallerLogos) {
 		printmsg("Checking caller logos\n");
 		Bitmap.Type 	= GSM_CallerGroupLogo;
 		Bitmap.Location = 1;
 		error=Phone->GetBitmap(&s,&Bitmap);
 		if (error == ERR_NONE) {
 			if (answer_yes("   Backup caller groups and logos")) DoBackup = true;
 		}
 	}
 	if (DoBackup) {
 		printmsgerr("   Reading : ");
 		error = ERR_NONE;
@@ -4225,24 +4309,92 @@ static void Backup(int argc, char *argv[])
 		if (error == ERR_NONE) {
 			if (strcmp(Bitmap.NetworkCode,"000 00")!=0) {
 				if (answer_yes("   Backup operator logo")) DoBackup = true;
 			}
 		}
 	}
 	if (DoBackup) {
 		Backup.OperatorLogo = malloc(sizeof(GSM_Bitmap));
 	        if (Backup.OperatorLogo == NULL) Print_Error(ERR_MOREMEMORY);
 		*Backup.OperatorLogo = Bitmap;
 	}
 	DoBackup = false;
+	if (Info.WAPBookmark) {
+		printmsg("Checking WAP bookmarks\n");
+		Bookmark.Location = 1;
+		error=Phone->GetWAPBookmark(&s,&Bookmark);
+		if (error==ERR_NONE) {
+			if (answer_yes("   Backup WAP bookmarks")) DoBackup = true;
+		}
+	}
+	if (DoBackup) {
+		used = 0;
+		printmsgerr("   Reading : ");
+		while (error == ERR_NONE) {
+			if (used < GSM_BACKUP_MAX_WAPBOOKMARK) {
+				Backup.WAPBookmark[used] = malloc(sizeof(GSM_WAPBookmark));
+			        if (Backup.WAPBookmark[used] == NULL) Print_Error(ERR_MOREMEMORY);
+				Backup.WAPBookmark[used+1] = NULL;
+			} else {
+				printmsg("   Increase %s\n" , "GSM_BACKUP_MAX_WAPBOOKMARK");
+				GSM_Terminate();
+				exit(-1);
+			}
+			*Backup.WAPBookmark[used]=Bookmark;
+			used ++;
+			Bookmark.Location = used+1;
+			error=Phone->GetWAPBookmark(&s,&Bookmark);
+			printmsgerr("*");
+			if (gshutdown) {
+				GSM_Terminate();
+				exit(0);
+			}
+		}
+		printmsgerr("\n");
+	}
+	DoBackup = false;
+	if (Info.WAPSettings) {
+		printmsg("Checking WAP settings\n");
+		Settings.Location = 1;
+		error=Phone->GetWAPSettings(&s,&Settings);
+		if (error==ERR_NONE) {
+			if (answer_yes("   Backup WAP settings")) DoBackup = true;
+		}
+	}
+	if (DoBackup) {
+		used = 0;
+		printmsgerr("   Reading : ");
+		while (error == ERR_NONE) {
+			if (used < GSM_BACKUP_MAX_WAPSETTINGS) {
+				Backup.WAPSettings[used] = malloc(sizeof(GSM_MultiWAPSettings));
+			        if (Backup.WAPSettings[used] == NULL) Print_Error(ERR_MOREMEMORY);
+				Backup.WAPSettings[used+1] = NULL;
+			} else {
+				printmsg("   Increase %s\n" , "GSM_BACKUP_MAX_WAPSETTINGS");
+				GSM_Terminate();
+				exit(-1);
+			}
+			*Backup.WAPSettings[used]=Settings;
+			used ++;
+			Settings.Location = used+1;
+			error=Phone->GetWAPSettings(&s,&Settings);
+			printmsgerr("*");
+			if (gshutdown) {
+				GSM_Terminate();
+				exit(0);
+			}
+		}
+		printmsgerr("\n");
+	}
+	DoBackup = false;
 	if (Info.MMSSettings) {
 		printmsg("Checking MMS settings\n");
 		Settings.Location = 1;
 		error=Phone->GetMMSSettings(&s,&Settings);
 		if (error==ERR_NONE) {
 			if (answer_yes("   Backup MMS settings")) DoBackup = true;
 		}
 	}
 	if (DoBackup) {
 		used = 0;
 		printmsgerr("   Reading : ");
 		while (error == ERR_NONE) {
@@ -4259,83 +4411,83 @@ static void Backup(int argc, char *argv[])
 			used ++;
 			Settings.Location = used+1;
 			error=Phone->GetMMSSettings(&s,&Settings);
 			printmsgerr("*");
 			if (gshutdown) {
 				GSM_Terminate();
 				exit(0);
 			}
 		}
 		printmsgerr("\n");
 	}
 	DoBackup = false;
-	if (Info.WAPBookmark) {
-		printmsg("Checking WAP bookmarks\n");
-		Bookmark.Location = 1;
-		error=Phone->GetWAPBookmark(&s,&Bookmark);
+	if (Info.ChatSettings) {
+		printmsg("Checking Chat settings\n");
+		Chat.Location = 1;
+		error=Phone->GetChatSettings(&s,&Chat);
 		if (error==ERR_NONE) {
-			if (answer_yes("   Backup WAP bookmarks")) DoBackup = true;
+			if (answer_yes("   Backup Chat settings")) DoBackup = true;
 		}
 	}
 	if (DoBackup) {
 		used = 0;
 		printmsgerr("   Reading : ");
 		while (error == ERR_NONE) {
-			if (used < GSM_BACKUP_MAX_WAPBOOKMARK) {
-				Backup.WAPBookmark[used] = malloc(sizeof(GSM_WAPBookmark));
-			        if (Backup.WAPBookmark[used] == NULL) Print_Error(ERR_MOREMEMORY);
-				Backup.WAPBookmark[used+1] = NULL;
+			if (used < GSM_BACKUP_MAX_CHATSETTINGS) {
+				Backup.ChatSettings[used] = malloc(sizeof(GSM_ChatSettings));
+			        if (Backup.ChatSettings[used] == NULL) Print_Error(ERR_MOREMEMORY);
+				Backup.ChatSettings[used+1] = NULL;
 			} else {
-				printmsg("   Increase %s\n" , "GSM_BACKUP_MAX_WAPBOOKMARK");
+				printmsg("   Increase %s\n" , "GSM_BACKUP_MAX_CHATSETTINGS");
 				GSM_Terminate();
 				exit(-1);
 			}
-			*Backup.WAPBookmark[used]=Bookmark;
+			*Backup.ChatSettings[used]=Chat;
 			used ++;
-			Bookmark.Location = used+1;
-			error=Phone->GetWAPBookmark(&s,&Bookmark);
+			Chat.Location = used+1;
+			error=Phone->GetChatSettings(&s,&Chat);
 			printmsgerr("*");
 			if (gshutdown) {
 				GSM_Terminate();
 				exit(0);
 			}
 		}
 		printmsgerr("\n");
 	}
 	DoBackup = false;
-	if (Info.WAPSettings) {
-		printmsg("Checking WAP settings\n");
-		Settings.Location = 1;
-		error=Phone->GetWAPSettings(&s,&Settings);
+	if (Info.SyncMLSettings) {
+		printmsg("Checking SyncML settings\n");
+		SyncML.Location = 1;
+		error=Phone->GetSyncMLSettings(&s,&SyncML);
 		if (error==ERR_NONE) {
-			if (answer_yes("   Backup WAP settings")) DoBackup = true;
+			if (answer_yes("   Backup SyncML settings")) DoBackup = true;
 		}
 	}
 	if (DoBackup) {
 		used = 0;
 		printmsgerr("   Reading : ");
 		while (error == ERR_NONE) {
-			if (used < GSM_BACKUP_MAX_WAPSETTINGS) {
-				Backup.WAPSettings[used] = malloc(sizeof(GSM_MultiWAPSettings));
-			        if (Backup.WAPSettings[used] == NULL) Print_Error(ERR_MOREMEMORY);
-				Backup.WAPSettings[used+1] = NULL;
+			if (used < GSM_BACKUP_MAX_SYNCMLSETTINGS) {
+				Backup.SyncMLSettings[used] = malloc(sizeof(GSM_SyncMLSettings));
+			        if (Backup.SyncMLSettings[used] == NULL) Print_Error(ERR_MOREMEMORY);
+				Backup.SyncMLSettings[used+1] = NULL;
 			} else {
-				printmsg("   Increase %s\n" , "GSM_BACKUP_MAX_WAPSETTINGS");
+				printmsg("   Increase %s\n" , "GSM_BACKUP_MAX_SYNCMLSETTINGS");
 				GSM_Terminate();
 				exit(-1);
 			}
-			*Backup.WAPSettings[used]=Settings;
+			*Backup.SyncMLSettings[used]=SyncML;
 			used ++;
-			Settings.Location = used+1;
-			error=Phone->GetWAPSettings(&s,&Settings);
+			SyncML.Location = used+1;
+			error=Phone->GetSyncMLSettings(&s,&SyncML);
 			printmsgerr("*");
 			if (gshutdown) {
 				GSM_Terminate();
 				exit(0);
 			}
 		}
 		printmsgerr("\n");
 	}
 	DoBackup = false;
 	if (Info.Ringtone) {
 		printmsg("Checking user ringtones\n");
 		Ringtone.Location 	= 1;
@@ -4493,32 +4645,37 @@ static void Restore(int argc, char *argv[])
 	GSM_MemoryStatus	MemStatus;
 	GSM_ToDoEntry		ToDo;
 	GSM_ToDoStatus		ToDoStatus;
 	GSM_Profile		Profile;
 	GSM_MultiWAPSettings	Settings;
 	GSM_GPRSAccessPoint	GPRSPoint;
 	GSM_WAPBookmark		Bookmark;
 	int			i, used, max = 0;
 	bool			Past = true;
 	bool			Found, DoRestore;
 
 	error=GSM_ReadBackupFile(argv[2],&Backup);
+	if (error!=ERR_NOTIMPLEMENTED) {
 	Print_Error(error);
+	} else {
+		printmsgerr("WARNING: Some data not read from file. It can be damaged or restoring some settings from this file format not implemented (maybe higher Gammu required ?)\n");
+	}
 
 	signal(SIGINT, interrupt);
 	printmsgerr("Press Ctrl+C to break...\n");
 
 	if (Backup.DateTimeAvailable) 	printmsgerr("Time of backup : %s\n",OSDateTime(Backup.DateTime,false));
 	if (Backup.Model[0]!=0) 	printmsgerr("Phone          : %s\n",Backup.Model);
 	if (Backup.IMEI[0]!=0) 		printmsgerr("IMEI           : %s\n",Backup.IMEI);
+	if (Backup.Creator[0]!=0) 	printmsgerr("File created by : %s\n",Backup.Creator);
 
 	if (Backup.MD5Calculated[0]!=0) {
 		dbgprintf("\"%s\"\n",Backup.MD5Original);
 		dbgprintf("\"%s\"\n",Backup.MD5Calculated);
 		if (strcmp(Backup.MD5Original,Backup.MD5Calculated)) {
 			if (!answer_yes("Checksum in backup file do not match. Continue")) return;			
 		}
 	}
 
 	GSM_Init(true);
 
 	DoRestore = false;
@@ -4609,47 +4766,44 @@ static void Restore(int argc, char *argv[])
 			error=Phone->SetBitmap(&s,Backup.CallerLogos[i]);
 			Print_Error(error);
 			printmsgerr("%cWriting: %i percent",13,(i+1)*100/max);
 			if (gshutdown) {
 				GSM_Terminate();
 				exit(0);
 			}
 		}
 		printmsgerr("\n");
 	}
 	
 	if (!mystrncasecmp(s.CurrentConfig->SyncTime,"yes",0)) {
-		if (/*answer_yes("Do you want to set date/time in phone (NOTE: in some phones it's required to correctly restore calendar notes and other items)")*/ true ) {
+		if (answer_yes("Do you want to set date/time in phone (NOTE: in some phones it's required to correctly restore calendar notes and other items)")) {
 			GSM_GetCurrentDateTime(&date_time);
 
 			error=Phone->SetDateTime(&s, &date_time);
 			Print_Error(error);
 		}
 	}
 	DoRestore = false;
 	if (Backup.Calendar[0] != NULL) {
-				DoRestore = true;
 		/* N6110 doesn't support getting calendar status */
 		error = Phone->GetNextCalendar(&s,&Calendar,true);
 		if (error == ERR_NONE || error == ERR_INVALIDLOCATION || error == ERR_EMPTY) {
 			max = 0;
 			while (Backup.Calendar[max] != NULL) max++;
 			printmsgerr("%i entries in backup file\n",max);
+            // LR
+			//if (answer_yes("Restore calendar notes")) {
+            //Past    = answer_yes("Restore notes from the past");
 				DoRestore = true;
-                /*
-			if (answer_yes("Restore calendar notes")) {
-				Past    = answer_yes("Restore notes from the past");
-				DoRestore = true;
-			}
-                */
+                //}
 		}
 	}
 	if (DoRestore) {
 		printmsgerr("Deleting old notes: ");
 		error = Phone->DeleteAllCalendar(&s);
 		if (error == ERR_NOTSUPPORTED || error == ERR_NOTIMPLEMENTED) {
  			while (1) {
 				error = Phone->GetNextCalendar(&s,&Calendar,true);
 				if (error != ERR_NONE) break;
 				error = Phone->DeleteCalendar(&s,&Calendar);
  				Print_Error(error);				
 				printmsgerr("*");
@@ -4670,39 +4824,36 @@ static void Restore(int argc, char *argv[])
 			if (gshutdown) {
 				GSM_Terminate();
 				exit(0);
 			}
 		}
 		printmsgerr("\n");
 	}
 
 	DoRestore = false;
 	if (Backup.ToDo[0] != NULL) {
 		error = Phone->GetToDoStatus(&s,&ToDoStatus);
 		if (error == ERR_NONE) {
-            error == ERR_NOTSUPPORTED;
-            DoRestore = true;
 			max = 0;
 			while (Backup.ToDo[max]!=NULL) max++;
 			printmsgerr("%i entries in backup file\n",max);
 
-			/*if (answer_yes("Restore ToDo")) */DoRestore = true;
+			//LR if (answer_yes("Restore ToDo")) 
+            DoRestore = true;
 		}
 	}
 	if (DoRestore) {
-        if ( max > 0 ) {
 		ToDo  = *Backup.ToDo[0];
 		error = Phone->SetToDo(&s,&ToDo);
         }
-	}
 	if (DoRestore && (error == ERR_NOTSUPPORTED || error == ERR_NOTIMPLEMENTED)) {
 		printmsgerr("Deleting old ToDo: ");
 		error=Phone->DeleteAllToDo(&s);
 		if (error == ERR_NOTSUPPORTED || error == ERR_NOTIMPLEMENTED) {
 			while (1) {
 				error = Phone->GetNextToDo(&s,&ToDo,true);
 				if (error != ERR_NONE) break;
 				error = Phone->DeleteToDo(&s,&ToDo);
  				Print_Error(error);				
 				printmsgerr("*");
 			}
 			printmsgerr("\n");
@@ -4982,25 +5133,25 @@ static void AddNew(int argc, char *argv[])
 {
 	GSM_Backup		Backup;
 	GSM_DateTime 		date_time;
 	GSM_MemoryEntry		Pbk;
 	GSM_MemoryStatus	MemStatus;
 	GSM_ToDoEntry		ToDo;
 	GSM_ToDoStatus		ToDoStatus;
 	GSM_CalendarEntry	Calendar;
 	GSM_WAPBookmark		Bookmark;
 	int			i, max, j;
 
 	error=GSM_ReadBackupFile(argv[2],&Backup);
-	Print_Error(error);
+	if (error!=ERR_NOTIMPLEMENTED) Print_Error(error);
 
 	signal(SIGINT, interrupt);
 	printmsgerr("Press Ctrl+C to break...\n");
 
 	if (Backup.DateTimeAvailable) 	printmsgerr("Time of backup : %s\n",OSDateTime(Backup.DateTime,false));
 	if (Backup.Model[0]!=0) 	printmsgerr("Phone          : %s\n",Backup.Model);
 	if (Backup.IMEI[0]!=0) 		printmsgerr("IMEI           : %s\n",Backup.IMEI);
 
 	GSM_Init(true);
 
 	if (Backup.PhonePhonebook[0] != NULL) {
 		MemStatus.MemoryType = MEM_ME;
@@ -5609,26 +5760,25 @@ static void RestoreSMS(int argc, char *argv[])
 
 	GSM_Init(true);
 
 	error=Phone->GetSMSFolders(&s, &folders);
 	Print_Error(error);
 
 	while (Backup.SMS[smsnum] != NULL) {
 		SMS.Number = 1;
 		memcpy(&SMS.SMS[0],Backup.SMS[smsnum],sizeof(GSM_SMSMessage));	
 		displaymultismsinfo(SMS,false,false);
 		sprintf(buffer,"Restore sms to folder \"%s\"",DecodeUnicodeConsole(folders.Folder[Backup.SMS[smsnum]->Folder-1].Name));
 		if (answer_yes(buffer)) {
-			Backup.SMS[smsnum]->Location = 0;
-			error=Phone->SetSMS(&s, Backup.SMS[smsnum]);
+			error=Phone->AddSMS(&s, Backup.SMS[smsnum]);
 			Print_Error(error);
 		}
 		smsnum++;
 	}
 
 	GSM_Terminate();
 }
 #endif
 
 static void CopyBitmap(int argc, char *argv[])
 {
 	GSM_MultiBitmap Bitmap;
@@ -5804,25 +5954,25 @@ static void NokiaComposer(int argc, char *argv[])
 		        		while (DefNoteDuration != Duration) {
 						printmsg("8");
 			  			DefNoteDuration = DefNoteDuration / 2;
 					}
 			      	}
 				printmsg(" ");
 			}
 		}
 	}
 
 	printf("\n");
 }
-//#if 0
+
 static void CopyRingtone(int argc, char *argv[])
 {
 	GSM_Ringtone 		ringtone, ringtone2;
 	GSM_RingtoneFormat	Format;
 
 	ringtone.Format	= 0;
 	error=GSM_ReadRingtoneFile(argv[2],&ringtone);
 	Print_Error(error);
 
 	Format = ringtone.Format;
 	if (argc == 5) {
 		if (mystrncasecmp(argv[4],"RTTL",0)) {		Format = RING_NOTETONE;
@@ -6089,25 +6239,25 @@ static void ListToDoCategory(int argc, char *argv[])
 		EncodeUnicode(Text, argv[2], Length);
 
 		Category.Type 	= Category_ToDo;
 		Status.Type 	= Category_ToDo;
 		
 		if (Phone->GetCategoryStatus(&s, &Status) == ERR_NONE) {
 			for (count=0,j=1;count<Status.Used;j++) {
 				Category.Location=j;
 				error=Phone->GetCategory(&s, &Category);
 			
 				if (error != ERR_EMPTY) {
 					count++;
-					if (mystrstr(Category.Name, Text) != NULL) {
+					if (mywstrstr(Category.Name, Text) != NULL) {
 						ListToDoCategoryEntries(j);
 					}
 				}
 			}
 		}
 	}
 	GSM_Terminate();
 }
 
 
 static void GetToDo(int argc, char *argv[])
 {
@@ -6142,49 +6292,42 @@ static void GetAllToDo(int argc, char *argv[])
 
 	while (!gshutdown) {
 		error = Phone->GetNextToDo(&s, &ToDo, start);
 		if (error == ERR_EMPTY) break;
 		Print_Error(error);
 		PrintToDo(&ToDo);
  		start = false;
 	}
 
 	GSM_Terminate();        	
 }
 
-static void GetNote(int argc, char *argv[])
+static void GetAllNotes(int argc, char *argv[])
 {
 	GSM_NoteEntry		Note;
-	int			start,stop;
-	bool			refresh=true;
+	bool			start = true;
 
-	GetStartStop(&start, &stop, 2, argc, argv);
+	signal(SIGINT, interrupt);
+	printmsgerr("Press Ctrl+C to break...\n");
 
 	GSM_Init(true);
 
-	for (i=start;i<=stop;i++) {
-		Note.Location=i;
-		printmsg("Location  : %i\n",i);
-		error=Phone->GetNote(&s,&Note,refresh);
-		if (error != ERR_EMPTY) Print_Error(error);
-
-		if (error == ERR_EMPTY) {
-			printmsg("Entry is empty\n\n");
-		} else {
+	while (!gshutdown) {
+		error = Phone->GetNextNote(&s, &Note, start);
+		if (error == ERR_EMPTY) break;
+		Print_Error(error);
                        	printmsg("Text         : \"%s\"\n",DecodeUnicodeConsole(Note.Text));
         	    	printf("\n");
-	            	refresh=false;
-	        }
+ 		start = false;
 	}
-
 	GSM_Terminate();        	
 }
 
 static void GetSecurityStatus(int argc, char *argv[])
 {
 	GSM_Init(true);
 
 	PrintSecurityStatus();
 
 	GSM_Terminate();
 }
 
@@ -6562,39 +6705,64 @@ static void MakeConvertTable(int argc, char *argv[])
 			printf("\"\\\n\"");
 			j=0;
 		}
 		printf("\\x%02x\\x%02x",Buffer[i*2],Buffer[i*2+1]);
 	}
 	printf("\\x00\\x00");
 }
 #endif
 
 static void ListNetworks(int argc, char *argv[])
 {
 	extern unsigned char 	*GSM_Networks[];
+	extern unsigned char 	*GSM_Countries[];
 	int 			i=0;
+	char			country[4]="";
 
-	printmsg("Network  Name\n\n");
+	if (argc>2) {
+		while (GSM_Countries[i*2]!=NULL) {
+			if (!strncmp(GSM_Countries[i*2+1],argv[2],strlen(argv[2]))) {
+				strcpy(country,GSM_Countries[i*2]);
+				printmsg("Networks for %s:\n\n",GSM_Countries[i*2+1]);
+				break;
+			}
+			i++;
+		}
+		if (!*country) {
+			printmsg("Unknown country name.");
+			exit(-1);
+		}
+	}
+	printmsg("Network  Name\n");
+	i=0;
 	while (GSM_Networks[i*2]!=NULL) {
+		if (argc>2) {
+		        if (!strncmp(GSM_Networks[i*2],country,strlen(country))) {
 		printmsg("%s  %s\n", GSM_Networks[i*2], GSM_Networks[i*2+1]);
+			}
+		} else {
+			printmsg("%s   %s\n", GSM_Networks[i*2], GSM_Networks[i*2+1]);
+		}
 		i++;
 	}
 }
 
 static void Version(int argc, char *argv[])
 {
 //	unsigned char 	buff[10];
 //	int		len;
 
-	printmsg("[Gammu version %s built %s %s]\n\n",VERSION,__TIME__,__DATE__);
+	printmsg("[Gammu version %s built %s %s",VERSION,__TIME__,__DATE__);
+	if (strlen(GetCompiler()) != 0) printmsg(" in %s",GetCompiler());
+	printmsg("]\n\n");
 
 #ifdef DEBUG
 	printf("GSM_SMSMessage  - %i\n",sizeof(GSM_SMSMessage));
 	printf("GSM_SMSC        - %i\n",sizeof(GSM_SMSC));
 	printf("GSM_SMS_State   - %i\n",sizeof(GSM_SMS_State));
 	printf("GSM_UDHHeader   - %i\n",sizeof(GSM_UDHHeader));
 	printf("bool            - %i\n",sizeof(bool));
 	printf("GSM_DateTime    - %i\n",sizeof(GSM_DateTime));
 	printf("int             - %i\n",sizeof(int));
 	printf("GSM_NetworkInfo - %i\n",sizeof(GSM_NetworkInfo));
 #endif
 
@@ -6693,53 +6861,47 @@ static void GetFileSystem(int argc, char *argv[])
 						printf(" %9i",Files.Used);
 						printf(" ");
 					} else printf("|-- ");
 				} else printf("Folder ");
 			} else {
 				if (Files.Level != 1) {
 					for (j=0;j<Files.Level-2;j++) printf(" |   ");
 					printf(" |-- ");
 				}
 				if (Files.Folder) printf("Folder ");
 			}
 			printf("\"%s\"",DecodeUnicodeConsole(Files.Name));
-			printf("\n");
-	
-			Start = false;
 		} else if (argc > 2 && mystrncasecmp(argv[2],"-flatall",0)) {
 			/* format for a folder ID;Folder;FOLDER_NAME;[FOLDER_PARAMETERS] 
 			 * format for a file   ID;File;FOLDER_NAME;FILE_NAME;DATESTAMP;FILE_SIZE;[FILE_PARAMETERS]  */	
 			if (!Files.Folder) {
 				printf("%s;File;",Files.ID_FullName);
 				printf("\"%s\";",FolderName);
 				printf("\"%s\";",DecodeUnicodeConsole(Files.Name));
 				if (!Files.ModifiedEmpty) {
 					printf("\"%s\";",OSDateTime(Files.Modified,false));
 				} else  printf("\"%c\";",0x20);
 				printf("%i;",Files.Used);
 			} else {
 				printf("%s;Folder;",Files.ID_FullName);
 				printf("\"%s\";",DecodeUnicodeConsole(Files.Name));
 				strcpy(FolderName,DecodeUnicodeConsole(Files.Name));
 			}	
 			
 			if (Files.Protected)  	printf("P");  
 			if (Files.ReadOnly)  	printf("R");  
 			if (Files.Hidden)  	printf("H"); 
 			if (Files.System)  	printf("S"); 
-		
-			printf("\n");
-	
-			Start = false;
 		}
+		Start = false;
 	}	
 
 	error = Phone->GetFileSystemStatus(&s,&Status);
 	if (error != ERR_NOTSUPPORTED && error != ERR_NOTIMPLEMENTED) {
 	    	Print_Error(error);
 		printmsg("\nFree memory: %i, total memory: %i\n",Status.Free,Status.Free+Status.Used);
 	}
 
 	GSM_Terminate();
 }
 
 static void GetOneFile(GSM_File *File, bool newtime, int i)
@@ -7029,28 +7191,32 @@ static struct NokiaFolderInfo Folder[] = {
 	{"",	 "MMSSent",		"SENT",		"3"},
 	{"",	 "MMSDrafts",		"DRAFTS",	"3"},
 	{"",	 "Application",		"applications",	"3"},
 	{"",	 "Game",		"games",	"3"},
 	/* Language depedent in DCT4 */
 	{"",	 "Gallery",		"Pictures",	"2"}, /* 3510  */
 	{"",	 "Gallery",		"Graphics",	"3"}, /* 3510i */
 	{"",	 "Gallery",		"Images",	"3"}, /* 6610  */
 	{"3510", "Gallery",		"",		"8"},
 	{"3510i","Gallery",		"",		"3"},
 	{"5100", "Gallery",		"",		"3"},
 	{"6220", "Gallery",		"",		"5"},
+	{"6610", "Gallery",		"",		"2"},
+	{"7210", "Gallery",		"",		"2"},
 	{"",	 "Tones",		"Tones",	"3"},
 	{"3510i","Tones",		"",		"4"},
 	{"5100", "Tones",		"",		"4"},
 	{"6220", "Tones",		"",		"6"},
+	{"6610", "Tones",		"",		"4"},
+	{"7210", "Tones",		"",		"4"},
 	/* Language indepedent in OBEX */
 	{"obex", "MMSUnreadInbox",	"",		"predefMessages\\predefINBOX"	},
 	{"obex", "MMSReadInbox",	"",		"predefMessages\\predefINBOX"	},
 	{"obex", "MMSOutbox",		"",		"predefMessages\\predefOUTBOX"	},
 	{"obex", "MMSSent",		"",		"predefMessages\\predefSENT"	}, 	
 	{"obex", "MMSDrafts",		"",		"predefMessages\\predefDRAFTS"	},
 //	{"obex", "Application,		"",		"predefjava\\predefapplications"},
 //	{"obex", "Game",		"",		"predefjava\\predefgames"	},
 	{"obex", "Gallery",		"",		"predefgallery\\predefgraphics"	},
 	{"obex", "Tones",		"",		"predefgallery\\predeftones"	},
 
 	/* End of list */
@@ -7549,105 +7715,111 @@ static void CallDivert(int argc, char *argv[])
                 	case GSM_DIVERT_DataCalls : printmsg("data");		 	break;
                 	default                   : printmsg("unknown %i",cd.Response.Entries[i].CallType);break;
               	}
 		printf("\n");
                	printmsg("   Timeout    : %i seconds\n",cd.Response.Entries[i].Timeout);
                 printmsg("   Number     : %s\n",DecodeUnicodeString(cd.Response.Entries[i].Number));
         }
 	printf("\n");
 
 	GSM_Terminate();
 }
 
-
-//#if 0
 static void CancelAllDiverts(int argc, char *argv[])
 {
 	GSM_Init(true);
 
 	error = Phone->CancelAllDiverts(&s);
     	Print_Error(error);
 
 	GSM_Terminate();
 }
 
+typedef struct {
+	unsigned char		Connection[50];
+} OneConnectionInfo;
+
+typedef struct {
+	unsigned char 		Device[50];
+	OneConnectionInfo 	Connections[4];
+} OneDeviceInfo;
 
+int				num;
+bool				SearchOutput;
 
 void SearchPhoneThread(OneDeviceInfo *Info)
 {
+    //LR
+#if 0
 	int 		 	j;
 	GSM_Error	 	error;
-    fprintf(stderr,"***********************************  \n");
-    fprintf(stderr,"***********************************  \n");
-    fprintf(stderr,"***********************************  \n");
-    fprintf(stderr,"***********************************  \n");
-    fprintf(stderr,"***********************************  \n");
-#if 0
+	GSM_StateMachine	ss;
+
 	j = 0;
 	while(strlen(Info->Connections[j].Connection) != 0) {
-		memcpy(&Info->s.di,&s.di,sizeof(Debug_Info));
-		Info->s.msg				= s.msg;
-		Info->s.ConfigNum			= 1;
-		Info->s.opened 				= false;
-	    	Info->s.Config[0].UseGlobalDebugFile = s.Config[0].UseGlobalDebugFile;
-		Info->s.Config[0].Localize		= s.Config[0].Localize;
-		Info->s.Config[0].Device 		= Info->Device;
-		Info->s.Config[0].Connection		= Info->Connections[j].Connection;
-		Info->s.Config[0].SyncTime		= "no";
-		Info->s.Config[0].DebugFile		= s.Config[0].DebugFile;
-		Info->s.Config[0].Model[0]		= 0;
-		strcpy(Info->s.Config[0].DebugLevel,s.Config[0].DebugLevel);
-		Info->s.Config[0].LockDevice		= "no";
-		Info->s.Config[0].StartInfo		= "no";
-
-		error = GSM_InitConnection(&Info->s,1);
+		memcpy(&ss.di,&s.di,sizeof(Debug_Info));
+		ss.msg				= s.msg;
+		ss.ConfigNum			= 1;
+		ss.opened 			= false;
+	    	ss.Config[0].UseGlobalDebugFile = s.Config[0].UseGlobalDebugFile;
+		ss.Config[0].Localize		= s.Config[0].Localize;
+		ss.Config[0].Device 		= Info->Device;
+		ss.Config[0].Connection		= Info->Connections[j].Connection;
+		ss.Config[0].SyncTime		= "no";
+		ss.Config[0].DebugFile		= s.Config[0].DebugFile;
+		ss.Config[0].Model[0]		= 0;
+		strcpy(ss.Config[0].DebugLevel,s.Config[0].DebugLevel);
+		ss.Config[0].LockDevice		= "no";
+		ss.Config[0].StartInfo		= "no";
+
+		error = GSM_InitConnection(&ss,1);
 		if (SearchOutput) printf("Connection \"%s\" on device \"%s\"\n",Info->Connections[j].Connection,Info->Device);
 		if (error == ERR_NONE) {
-			error=Info->s.Phone.Functions->GetManufacturer(&Info->s);
+			error=ss.Phone.Functions->GetManufacturer(&ss);
 			if (error == ERR_NONE) {
-				error=Info->s.Phone.Functions->GetModel(&Info->s);
+				error=ss.Phone.Functions->GetModel(&ss);
 				if (error == ERR_NONE) {
 					if (!SearchOutput) printf("Connection \"%s\" on device \"%s\"\n",Info->Connections[j].Connection,Info->Device);
 					printmsg("   Manufacturer  : %s\n",
-						Info->s.Phone.Data.Manufacturer);
+						ss.Phone.Data.Manufacturer);
 					printmsg("   Model         : %s (%s)\n",
-						Info->s.Phone.Data.ModelInfo->model,
-						Info->s.Phone.Data.Model);
+						ss.Phone.Data.ModelInfo->model,
+						ss.Phone.Data.Model);
 				} else {
-					if (SearchOutput) printf("   %s\n",print_error(error,Info->s.di.df,Info->s.msg));
+					if (SearchOutput) printf("   %s\n",print_error(error,ss.di.df,ss.msg));
 				}
 			} else {
-				if (SearchOutput) printf("   %s\n",print_error(error,Info->s.di.df,Info->s.msg));
+				if (SearchOutput) printf("   %s\n",print_error(error,ss.di.df,ss.msg));
 			}
 		} else {
-			if (SearchOutput) printf("   %s\n",print_error(error,Info->s.di.df,Info->s.msg));
+			if (SearchOutput) printf("   %s\n",print_error(error,ss.di.df,ss.msg));
 		}
 		if (error != ERR_DEVICEOPENERROR) {
-			GSM_TerminateConnection(&Info->s);
+			GSM_TerminateConnection(&ss);
 			dbgprintf("Closing done\n");
 		}
-		if (error == ERR_DEVICEOPENERROR || error == ERR_NONE) break;
+		if (error == ERR_DEVICEOPENERROR) break;
 		j++;
 	}
 	num--;
 #endif
 }
 
-//#undef HAVE_PTHREAD
-//#if 0
 #if defined(WIN32) || defined(HAVE_PTHREAD)
 #ifdef HAVE_PTHREAD
 	pthread_t Thread[100];
 #endif
 
+OneDeviceInfo SearchDevices[60];
+
 void MakeSearchThread(int i)
 {
 	num++;
 #ifdef HAVE_PTHREAD
 	if (pthread_create(&Thread[i],NULL,(void *)SearchPhoneThread,&SearchDevices[i])!=0) {
 		dbgprintf("Error creating thread\n");
 	}
 #else
 	if (CreateThread((LPSECURITY_ATTRIBUTES)NULL,0,
 		     (LPTHREAD_START_ROUTINE)SearchPhoneThread,&SearchDevices[i],
 		     0,NULL)==NULL) {
 		dbgprintf("Error creating thread\n");
@@ -7658,30 +7830,31 @@ void MakeSearchThread(int i)
 static void SearchPhone(int argc, char *argv[])
 {
 	int 	i,dev = 0, dev2 = 0;
 
 	SearchOutput = false;
 	if (argc == 3 && mystrncasecmp(argv[2], "-debug",0)) SearchOutput = true;
 
 	num = 0;
 #ifdef WIN32
 #  ifdef GSM_ENABLE_IRDADEVICE
 	sprintf(SearchDevices[dev].Device,"");		
 	sprintf(SearchDevices[dev].Connections[0].Connection,"irdaphonet");
-	SearchDevices[dev].Connections[1].Connection[0] = 0;
+	sprintf(SearchDevices[dev].Connections[1].Connection,"irdaat");
+	SearchDevices[dev].Connections[2].Connection[0] = 0;
 	dev++;
 #  endif
 #  ifdef GSM_ENABLE_SERIALDEVICE
 	dev2 = dev;
-	for(i=0;i<10;i++) {
+	for(i=0;i<20;i++) {
 		sprintf(SearchDevices[dev2].Device,"com%i:",i+1);		
 		sprintf(SearchDevices[dev2].Connections[0].Connection,"fbusdlr3");
 		sprintf(SearchDevices[dev2].Connections[1].Connection,"fbus");
 		sprintf(SearchDevices[dev2].Connections[2].Connection,"at19200");
 		sprintf(SearchDevices[dev2].Connections[3].Connection,"mbus");
 		SearchDevices[dev2].Connections[4].Connection[0] = 0;
 		dev2++;
 	}
 #  endif
 #endif
 #ifdef __linux__
 #  ifdef GSM_ENABLE_IRDADEVICE
@@ -7721,25 +7894,25 @@ static void SearchPhone(int argc, char *argv[])
 		sprintf(SearchDevices[dev2].Connections[3].Connection,"mbus");
 		SearchDevices[dev2].Connections[4].Connection[0] = 0;
 		dev2++;
 	}
 #  endif
 #endif
 	for(i=0;i<dev;i++) MakeSearchThread(i);
 	while (num != 0) my_sleep(5);
 	for(i=dev;i<dev2;i++) MakeSearchThread(i);
 	while (num != 0) my_sleep(5);
 }
 #endif /*Support for threads */
-// #if 0
+
 static void NokiaGetADC(int argc, char *argv[])
 {
 	GSM_Init(true);
 
 #ifdef GSM_ENABLE_NOKIA_DCT3
 	DCT3GetADC(argc,argv);
 #endif
 #ifdef GSM_ENABLE_NOKIA_DCT4
 	DCT4GetADC(argc, argv);
 #endif
 
 	GSM_Terminate();
@@ -7784,45 +7957,45 @@ static void NokiaVibraTest(int argc, char *argv[])
 	DCT4VibraTest(argc, argv);
 #endif
 
 	GSM_Terminate();
 }
 
 static GSM_Parameters Parameters[] = {
 	{"--identify",			0, 0, Identify,			{H_Info,0},			""},
 	{"--version",			0, 0, Version,			{H_Other,0},			""},
 	{"--getdisplaystatus",		0, 0, GetDisplayStatus,		{H_Info,0},			""},	
 	{"--monitor",			0, 1, Monitor,			{H_Info,H_Network,H_Call,0},	"[times]"},
 	{"--setautonetworklogin",	0, 0, SetAutoNetworkLogin,	{H_Network,0},			""},
-	{"--listnetworks",		0, 0, ListNetworks,		{H_Network,0},			""},
+	{"--listnetworks",		0, 1, ListNetworks,		{H_Network,0},			"[country]"},
 	{"--getgprspoint",		1, 2, GetGPRSPoint,		{H_Nokia,H_Network,0},		"start [stop]"},
 	{"--addfolder",			2, 2, AddFolder,		{H_Filesystem,0},		"parentfolderID name"},
 	{"--getfilesystem",		0, 1, GetFileSystem,		{H_Filesystem,0},		"[-flatall|-flat]"},
 	{"--getfilesystemstatus",	0, 0, GetFileSystemStatus,	{H_Filesystem,0},		""},
 	{"--getfiles",			1,40, GetFiles,			{H_Filesystem,0},		"ID1, ID2, ..."},
 	{"--getfilefolder",		1,40, GetFileFolder,		{H_Filesystem,0},		"ID1, ID2, ..."},
 	{"--addfile",			2, 6, AddFile,			{H_Filesystem,0},		"folderID name [-type JAR|BMP|PNG|GIF|JPG|MIDI|WBMP|AMR|3GP|NRT][-readonly][-protected][-system][-hidden][-newtime]"},
 	{"--nokiaaddfile",		2, 5, NokiaAddFile,		{H_Filesystem,H_Nokia,0},	"MMSUnreadInbox|MMSReadInbox|MMSOutbox|MMSDrafts|MMSSent file sender title"},
 	{"--nokiaaddfile",		2, 5, NokiaAddFile,		{H_Filesystem,H_Nokia,0},	"Application|Game file [-readonly]"},
 	{"--nokiaaddfile",		2, 5, NokiaAddFile,		{H_Filesystem,H_Nokia,0},	"Gallery|Tones file [-name name][-protected][-readonly][-system][-hidden][-newtime]"},
 	{"--deletefiles",		1,20, DeleteFiles,		{H_Filesystem,0},		"fileID"},
 	{"--playringtone",		1, 1, PlayRingtone, 		{H_Ringtone,0},			"file"},
 	{"--playsavedringtone",		1, 1, DCT4PlaySavedRingtone, 	{H_Ringtone,0},			""},
 	{"--getdatetime",		0, 0, GetDateTime,		{H_DateTime,0},			""},
 	{"--setdatetime",		0, 0, SetDateTime,		{H_DateTime,0},			""},
 	{"--getalarm",			0, 0, GetAlarm,			{H_DateTime,0},			""},
 	{"--setalarm",			2, 2, SetAlarm,			{H_DateTime,0},			"hour minute"},
 	{"--resetphonesettings",	1, 1, ResetPhoneSettings,	{H_Settings,0},			"PHONE|DEV|UIF|ALL|FACTORY"},
-	{"--getmemory",			2, 3, GetMemory,		{H_Memory,0},			"DC|MC|RC|ON|VM|SM|ME|FD start [stop]"},
-	{"--getallmemory",		1, 1, GetAllMemory,		{H_Memory,0},			"DC|MC|RC|ON|VM|SM|ME|FD"},
+	{"--getmemory",			2, 4, GetMemory,		{H_Memory,0},			"DC|MC|RC|ON|VM|SM|ME|FD start [stop [-nonempty]]"},
+	{"--getallmemory",		1, 2, GetAllMemory,		{H_Memory,0},			"DC|MC|RC|ON|VM|SM|ME|FD"},
 	{"--searchmemory",		1, 1, SearchMemory,		{H_Memory,0},			"text"},
 	{"--listmemorycategory",	1, 1, ListMemoryCategory,	{H_Memory, H_Category,0},	"text|number"},
 	{"--getfmstation",		1, 2, GetFMStation,		{H_FM,0},			"start [stop]"},
 	{"--getsmsc",			1, 2, GetSMSC,			{H_SMS,0},			"start [stop]"},
 	{"--getsms",			2, 3, GetSMS,			{H_SMS,0},			"folder start [stop]"},
 	{"--deletesms",			2, 3, DeleteSMS,		{H_SMS,0},			"folder start [stop]"},
 	{"--deleteallsms",		1, 1, DeleteAllSMS,		{H_SMS,0},			"folder"},
 	{"--getsmsfolders",		0, 0, GetSMSFolders,		{H_SMS,0},			""},
 	{"--getallsms",			0, 0, GetAllSMS,		{H_SMS,0},			""},
 	{"--geteachsms",		0, 0, GetEachSMS,		{H_SMS,0},			""},
 
 #define SMS_TEXT_OPTIONS	"[-inputunicode][-16bit][-flash][-len len][-autolen len][-unicode][-enablevoice][-disablevoice][-enablefax][-disablefax][-enableemail][-disableemail][-voidsms][-replacemessages ID][-replacefile file]"
@@ -7834,43 +8007,45 @@ static GSM_Parameters Parameters[] = {
 #define SMS_OPERATOR_OPTIONS	"[-netcode netcode][-biglogo]"
 #define SMS_SAVE_OPTIONS	"[-folder id][-unread][-read][-unsent][-sent][-sender number]"
 #define SMS_SEND_OPTIONS	"[-report][-validity HOUR|6HOURS|DAY|3DAYS|WEEK|MAX][-save [-folder number]]"
 #define SMS_COMMON_OPTIONS	"[-smscset number][-smscnumber number][-reply][-maxsms num]"
 
 	{"--savesms",			1,30, SendSaveDisplaySMS,	{H_SMS,0},			"TEXT " SMS_SAVE_OPTIONS SMS_COMMON_OPTIONS SMS_TEXT_OPTIONS},
 	{"--savesms",			1,30, SendSaveDisplaySMS,	{H_SMS,H_Ringtone,0},		"RINGTONE file " SMS_SAVE_OPTIONS SMS_COMMON_OPTIONS},
 	{"--savesms",			1,30, SendSaveDisplaySMS,	{H_SMS,H_Logo,0},		"OPERATOR file " SMS_SAVE_OPTIONS SMS_COMMON_OPTIONS SMS_OPERATOR_OPTIONS},
 	{"--savesms",			1,30, SendSaveDisplaySMS,	{H_SMS,H_Logo,0},		"CALLER file " SMS_SAVE_OPTIONS SMS_COMMON_OPTIONS},
 	{"--savesms",			1,30, SendSaveDisplaySMS,	{H_SMS,H_Logo,0},		"PICTURE file " SMS_SAVE_OPTIONS SMS_COMMON_OPTIONS SMS_PICTURE_OPTIONS},
 	{"--savesms",			1,30, SendSaveDisplaySMS,	{H_SMS,H_Logo,0},		"ANIMATION frames file1 file2... " SMS_SAVE_OPTIONS SMS_COMMON_OPTIONS SMS_ANIMATION_OPTIONS},
 	{"--savesms",			1,30, SendSaveDisplaySMS,	{H_SMS,H_MMS,0},		"MMSINDICATOR URL Title Sender " SMS_SAVE_OPTIONS SMS_COMMON_OPTIONS},
+	{"--savesms",			1,30, SendSaveDisplaySMS,	{H_SMS,H_WAP,0},		"WAPINDICATOR URL Title " SMS_SAVE_OPTIONS SMS_COMMON_OPTIONS},
 #ifdef GSM_ENABLE_BACKUP
 	{"--savesms",			1,30, SendSaveDisplaySMS,	{H_SMS,H_WAP,0},		"BOOKMARK file location " SMS_SAVE_OPTIONS SMS_COMMON_OPTIONS},
 	{"--savesms",			1,30, SendSaveDisplaySMS,	{H_SMS,H_WAP,0},		"WAPSETTINGS file location DATA|GPRS " SMS_SAVE_OPTIONS SMS_COMMON_OPTIONS},
 	{"--savesms",			1,30, SendSaveDisplaySMS,	{H_SMS,H_MMS,0},		"MMSSETTINGS file location  " SMS_SAVE_OPTIONS SMS_COMMON_OPTIONS},
 	{"--savesms",			1,30, SendSaveDisplaySMS,	{H_SMS,H_Calendar,0},		"CALENDAR file location " SMS_SAVE_OPTIONS SMS_COMMON_OPTIONS},
 	{"--savesms",			1,30, SendSaveDisplaySMS,	{H_SMS,H_ToDo,0},		"TODO file location " SMS_SAVE_OPTIONS SMS_COMMON_OPTIONS},
 	{"--savesms",			1,30, SendSaveDisplaySMS,	{H_SMS,H_Memory,0},		"VCARD10|VCARD21 file SM|ME location [-nokia]" SMS_SAVE_OPTIONS SMS_COMMON_OPTIONS},
 #endif
 	{"--savesms",			1,30, SendSaveDisplaySMS,	{H_SMS,H_Settings,0},		"PROFILE " SMS_SAVE_OPTIONS SMS_COMMON_OPTIONS SMS_PROFILE_OPTIONS},
 	{"--savesms",			1,30, SendSaveDisplaySMS,	{H_SMS,0},			"EMS " SMS_SAVE_OPTIONS SMS_COMMON_OPTIONS SMS_EMS_OPTIONS},
 	{"--savesms",			1,30, SendSaveDisplaySMS,	{H_SMS,0},			"SMSTEMPLATE " SMS_SAVE_OPTIONS SMS_COMMON_OPTIONS SMS_SMSTEMPLATE_OPTIONS},
 
 	{"--sendsms",			2,30, SendSaveDisplaySMS,	{H_SMS,0},			"TEXT destination " SMS_SEND_OPTIONS SMS_COMMON_OPTIONS SMS_TEXT_OPTIONS},
 	{"--sendsms",			2,30, SendSaveDisplaySMS,	{H_SMS,H_Ringtone,0},		"RINGTONE destination file " SMS_SEND_OPTIONS SMS_COMMON_OPTIONS},
 	{"--sendsms",			2,30, SendSaveDisplaySMS,	{H_SMS,H_Logo,0},		"OPERATOR destination file " SMS_SEND_OPTIONS SMS_COMMON_OPTIONS SMS_OPERATOR_OPTIONS},
 	{"--sendsms",			2,30, SendSaveDisplaySMS,	{H_SMS,H_Logo,0},		"CALLER destination file " SMS_SEND_OPTIONS SMS_COMMON_OPTIONS},
 	{"--sendsms",			2,30, SendSaveDisplaySMS,	{H_SMS,H_Logo,0},		"PICTURE destination file " SMS_SEND_OPTIONS SMS_COMMON_OPTIONS SMS_PICTURE_OPTIONS},
 	{"--sendsms",			2,30, SendSaveDisplaySMS,	{H_SMS,H_Logo,0},		"ANIMATION destination frames file1 file2... " SMS_SEND_OPTIONS SMS_COMMON_OPTIONS SMS_ANIMATION_OPTIONS},
 	{"--sendsms",			2,30, SendSaveDisplaySMS,	{H_SMS,H_MMS,0},		"MMSINDICATOR destination URL Title Sender " SMS_SEND_OPTIONS SMS_COMMON_OPTIONS},
+	{"--sendsms",			2,30, SendSaveDisplaySMS,	{H_SMS,H_WAP,0},		"WAPINDICATOR destination URL Title " SMS_SEND_OPTIONS SMS_COMMON_OPTIONS},
 #ifdef GSM_ENABLE_BACKUP
 	{"--sendsms",			2,30, SendSaveDisplaySMS,	{H_SMS,H_WAP,0},		"BOOKMARK destination file location " SMS_SEND_OPTIONS SMS_COMMON_OPTIONS},
 	{"--sendsms",			2,30, SendSaveDisplaySMS,	{H_SMS,H_WAP,0},		"WAPSETTINGS destination file location DATA|GPRS " SMS_SEND_OPTIONS SMS_COMMON_OPTIONS},
 	{"--sendsms",			2,30, SendSaveDisplaySMS,	{H_SMS,H_MMS,0},		"MMSSETTINGS destination file location " SMS_SEND_OPTIONS SMS_COMMON_OPTIONS},
 	{"--sendsms",			2,30, SendSaveDisplaySMS,	{H_SMS,H_Calendar,0},		"CALENDAR destination file location " SMS_SEND_OPTIONS SMS_COMMON_OPTIONS},
 	{"--sendsms",			2,30, SendSaveDisplaySMS,	{H_SMS,H_ToDo,0},		"TODO destination file location " SMS_SEND_OPTIONS SMS_COMMON_OPTIONS},
 	{"--sendsms",			2,30, SendSaveDisplaySMS,	{H_SMS,H_Memory,0},		"VCARD10|VCARD21 destination file SM|ME location [-nokia]" SMS_SEND_OPTIONS SMS_COMMON_OPTIONS},
 #endif
 	{"--sendsms",			2,30, SendSaveDisplaySMS,	{H_SMS,H_Settings,0},		"PROFILE destination " SMS_SEND_OPTIONS SMS_COMMON_OPTIONS ""SMS_PROFILE_OPTIONS},
 	{"--sendsms",			2,30, SendSaveDisplaySMS,	{H_SMS,0},			"EMS destination " SMS_SEND_OPTIONS SMS_COMMON_OPTIONS SMS_EMS_OPTIONS},
 	{"--sendsms",			2,30, SendSaveDisplaySMS,	{H_SMS,0},			"SMSTEMPLATE destination " SMS_SEND_OPTIONS SMS_COMMON_OPTIONS SMS_SMSTEMPLATE_OPTIONS},
 
@@ -7898,25 +8073,25 @@ static GSM_Parameters Parameters[] = {
 	{"--conferencecall",		1, 1, ConferenceCall,		{H_Call,0},			"ID"},
 	{"--splitcall",			1, 1, SplitCall,		{H_Call,0},			"ID"},
 	{"--switchcall",		0, 1, SwitchCall,		{H_Call,0},			"[ID]"},
 	{"--transfercall",		0, 1, TransferCall,		{H_Call,0},			"[ID]"},
 	{"--divert",			3, 5, CallDivert,		{H_Call,0},			"get|set all|busy|noans|outofreach all|voice|fax|data [number timeout]"},
 	{"--canceldiverts",		0, 0, CancelAllDiverts,		{H_Call,0},			""},
 	{"--senddtmf",			1, 1, SendDTMF,			{H_Call,0},			"sequence"},
 	{"--getcalendarsettings",	0, 0, GetCalendarSettings,	{H_Calendar,H_Settings,0},	""},
 	{"--getalltodo",		0, 0, GetAllToDo,		{H_ToDo,0},			""},
 	{"--listtodocategory",		1, 1, ListToDoCategory,		{H_ToDo, H_Category,0},		"text|number"},
 	{"--gettodo",			1, 2, GetToDo,			{H_ToDo,0},			"start [stop]"},
 	{"--deletetodo",		1, 2, DeleteToDo,		{H_ToDo,0},			"start [stop]"},
-	{"--getnote",			1, 2, GetNote,			{H_Note,0},			"start [stop]"},
+	{"--getallnotes",		0, 0, GetAllNotes,		{H_Note,0},			""},
 	{"--deletecalendar",		1, 2, DeleteCalendar,		{H_Calendar,0},			"start [stop]"},
 	{"--getallcalendar",		0, 0, GetAllCalendar,		{H_Calendar,0},			""},
 	{"--getcalendar",		1, 2, GetCalendar,		{H_Calendar,0},			"start [stop]"},
 	{"--getcategory",       	2, 3, GetCategory,       	{H_Category,H_ToDo,H_Memory,0},	"TODO|PHONEBOOK start [stop]"},
 	{"--getallcategory",	  	1, 1, GetAllCategories,  	{H_Category,H_ToDo,H_Memory,0},	"TODO|PHONEBOOK"},
 	{"--reset",			1, 1, Reset,			{H_Other,0},			"SOFT|HARD"},
 	{"--getprofile",		1, 2, GetProfile,		{H_Settings,0},			"start [stop]"},
 	{"--getsecuritystatus",		0, 0, GetSecurityStatus,	{H_Info,0},			""},
 	{"--entersecuritycode",		2, 2, EnterSecurityCode,	{H_Other,0},			"PIN|PUK|PIN2|PUK2 code"},
 	{"--deletewapbookmark", 	1, 2, DeleteWAPBookmark, 	{H_WAP,0},			"start [stop]"},
 	{"--getwapbookmark",		1, 2, GetWAPBookmark,		{H_WAP,0},			"start [stop]"},
 	{"--getwapsettings",		1, 2, GetWAPMMSSettings,	{H_WAP,0},			"start [stop]"},
@@ -7967,26 +8142,28 @@ static GSM_Parameters Parameters[] = {
 	{"--nokiagetoperatorname", 	0, 0, DCT3GetOperatorName,	{H_Nokia,H_Network,0},		""},
 	{"--nokiasetoperatorname", 	0, 2, DCT3SetOperatorName,	{H_Nokia,H_Network,0},		"[networkcode name]"},
 	{"--nokiadisplayoutput", 	0, 0, DCT3DisplayOutput,	{H_Nokia,0},			""},
 #endif
 #ifdef GSM_ENABLE_NOKIA_DCT3
 	{"--nokianetmonitor",		1, 1, DCT3netmonitor,		{H_Nokia,H_Network,0},		"test"},
 	{"--nokianetmonitor36",		0, 0, DCT3ResetTest36,		{H_Nokia,0},			""},
 	{"--nokiadebug",		1, 2, DCT3SetDebug,		{H_Nokia,H_Network,0},		"filename [[v11-22][,v33-44]...]"},
 #endif
 #ifdef GSM_ENABLE_NOKIA_DCT4
 	{"--nokiasetvibralevel",	1, 1, DCT4SetVibraLevel,	{H_Nokia,H_Other,0},		"level"},
 	{"--nokiagetvoicerecord",	1, 1, DCT4GetVoiceRecord,	{H_Nokia,H_Other,0},		"location"},
+#ifdef GSM_ENABLE_NOKIA6510
 	{"--nokiasetlights",		2, 2, DCT4SetLight,		{H_Nokia,H_Tests,0},		"keypad|display|torch on|off"},
 	{"--nokiatuneradio",		0, 0, DCT4TuneRadio,		{H_Nokia,H_FM,0},		""},
+#endif
 	{"--nokiamakecamerashoot",	0, 0, DCT4MakeCameraShoot,	{H_Nokia,H_Other,0},		""},
 	{"--nokiagetscreendump",	0, 0, DCT4GetScreenDump,	{H_Nokia,H_Other,0},		""},
 #endif
 #if defined(GSM_ENABLE_NOKIA_DCT3) || defined(GSM_ENABLE_NOKIA_DCT4)
 	{"--nokiavibratest",		0, 0, NokiaVibraTest,		{H_Nokia,H_Tests,0},		""},
 	{"--nokiagett9",		0, 0, NokiaGetT9,		{H_Nokia,H_SMS,0},		""},
 	{"--nokiadisplaytest",		1, 1, NokiaDisplayTest,		{H_Nokia,H_Tests,0},		"number"},
 	{"--nokiagetadc",		0, 0, NokiaGetADC,		{H_Nokia,H_Tests,0},		""},
 	{"--nokiasecuritycode",		0, 0, NokiaSecurityCode,	{H_Nokia,H_Info,0},		""},
 	{"--nokiaselftests",		0, 0, NokiaSelfTests,		{H_Nokia,H_Tests,0},		""},
 	{"--nokiasetphonemenus",	0, 0, NokiaSetPhoneMenus,	{H_Nokia,H_Other,0},		""},
 #endif
@@ -8037,29 +8214,29 @@ static HelpCategoryDescriptions HelpDescriptions[] = {
 void HelpHeader(void)
 {
 	printmsg("[Gammu version %s built %s %s]\n\n",VERSION,__TIME__,__DATE__);
 }
 
 static void HelpGeneral(void)
 {
 	int	i=0;
 
 	HelpHeader();
 
  	printmsg("Usage: gammu [confign] [nothing|text|textall|binary|errors] [options]\n\n");
- 	printmsg("First parameter optionally specifies which config section to use (by default are probed all).\n");
- 	printmsg("Second parameter optionally controls debug level, next specify actions.\n\n");
+ 	printmsg("First parameter optionally specifies which config section to use (all are probed by default).\n");
+ 	printmsg("Second parameter optionally controls debug level, next one specifies actions.\n\n");
 
 	/* We might want to put here some most used commands */
-	printmsg("For more details call help on specific topic (gammu --help topic), topics are:\n\n");
+	printmsg("For more details, call help on specific topic (gammu --help topic). Topics are:\n\n");
 
 	while (HelpDescriptions[i].category != 0) {
 		printf("%11s - %s\n", HelpDescriptions[i].option, HelpDescriptions[i].description);
 		i++;
 	}
 	printf("\n");
 }
 
 static void HelpSplit(int cols, int len, unsigned char *buff)
 {
 	int		l, len2, pos, split;
 	bool		in_opt,first=true;
@@ -8125,25 +8302,25 @@ static void Help(int argc, char *argv[])
 #endif
 
 	/* Just --help */
 	if (argc == 2) {
 		HelpGeneral();
 		return;
 	}
 
 	if (!strcmp(argv[2],"all")) {
 		HelpHeader();
 	} else {
 		while (HelpDescriptions[i].category != 0) {
-			if (strcmp(argv[2], HelpDescriptions[i].option) == 0) break;
+			if (mystrncasecmp(argv[2], HelpDescriptions[i].option,strlen(argv[2]))) break;
 			i++;
 		}
 		if (HelpDescriptions[i].category == 0) {
 			HelpGeneral();
 			printmsg("Unknown help topic specified!\n");
 			return;
 		}
 		HelpHeader();
 		printmsg("Gammu parameters, topic: %s\n\n", HelpDescriptions[i].description);
 	}
 
 #if defined(WIN32) || defined(DJGPP)
@@ -8197,140 +8374,90 @@ static void Help(int argc, char *argv[])
 		}
 		if (disp) {
 			printf("%s", Parameters[j].parameter);
 			if (Parameters[j].help[0] == 0) {
 				printf("\n");
 			} else {
 				HelpSplit(cols - 1, strlen(Parameters[j].parameter) + 1, Parameters[j].help);
 			}
 		}
 		j++;
 	}
 }
-#if 0
-#endif // 0
+
 int main(int argc, char *argv[])
 {
- 
-    //fprintf(stderr,"HIIIIIIIIIIIII  \n");
-    //#if 0
-	static int 	z ,start,i;
-	static int	only_config ;
-#if !defined(WIN32) && defined(LOCALE_PATH)
-	static char	*locale, locale_file[201];
+	int 	z = 0,start=0,i;
+	int	only_config = -1;
+#if !defined(WIN32) && !defined(DJGPP) && defined(LOCALE_PATH)
+	char	*locale, locale_file[201];
 #endif
-    static 	char	*cp; 
- 	static bool	count_failed;
-	z = 0;
-    start=0;only_config = -1;count_failed = false;
+	char	*cp;
+ 	bool	count_failed = false;
+
 	s.opened 	= false;
 	s.msg	 	= NULL;
 	s.ConfigNum 	= 0;
 
 	setlocale(LC_ALL, "");
 #ifdef DEBUG
 	di.dl		= DL_TEXTALL;
 	di.df	 	= stdout;
 #endif
-    //#if 0
+
  	/* Any parameters? */
 	if (argc == 1) {
 		HelpGeneral();
 		printmsg("Too few parameters!\n");
 		exit(1);
 	}
 
  	/* Help? */
 	if (strncmp(argv[1 + start], "--help", 6) == 0) {
 		Help(argc - start, argv + start);
 		exit(1);
 	}
 
  	/* Is first parameter numeric? If so treat it as config that should be loaded. */	
-	//if (isdigit(argv[1][0])) {
-    //only_config = atoi(argv[1]);
-    //if (only_config >= 0) start++; else only_config = -1;
-	//}
-    only_config = 0;;
-#if 0
-    GSM_ReadConfig(NULL, &s.Config[0], 0);
-	s.ConfigNum 	= 1;
-    GSM_Config *con = &s.Config[0];
-
-    char* tempC;
-    tempC = argv[argc-1]+2;
-    if ( *tempC != 0 ) {
-        fprintf(stderr,"Using model %s \n",tempC);
-		strcpy(con->Model,tempC );
-     }
-    tempC = argv[argc-2]+2;
-    if ( *tempC != 0 ) {
-        fprintf(stderr,"Using device %s \n",tempC);
-        con->Device = strdup(tempC);
-		con->DefaultDevice = false;
-     }
-    tempC = argv[argc-3]+2;
-    if ( *tempC != 0 ) {
-        fprintf(stderr,"Using connection %s \n",tempC);
-        con->Connection = strdup(tempC);
-		con->DefaultConnection = false;
-     }
-    argc = argc-3;
-    //#if 0
-    if ( ! mConnection.isEmpty() ) {
-        cfg->Connection = strdup(mConnection.latin1());
-		cfg->DefaultConnection = false;
-        qDebug("Connection set %s ", cfg->Connection );
-
+	if (isdigit(argv[1][0])) {
+		only_config = atoi(argv[1]);
+		if (only_config >= 0) start++; else only_config = -1;
     }
-    if ( ! mDevice.isEmpty() ) {
-        cfg->Device = strdup(mDevice.latin1());
-		cfg->DefaultDevice = false;
-        qDebug("Device  set %s ", cfg->Device);
-
-    }
-    if ( ! mModel.isEmpty() ) {
-		strcpy(cfg->Model,mModel.latin1() );
-		cfg->DefaultModel = false;
-        qDebug("Model  set %s ",cfg->Model );
-    }
-
-#endif
-
 
 	cfg=GSM_FindGammuRC();
+ 	if (cfg == NULL) printmsg("Warning: No configuration file found!\n");
+
 	for (i = 0; i <= MAX_CONFIG_NUM; i++) {
 		if (cfg!=NULL) {
 		        cp = INI_GetValue(cfg, "gammu", "gammucoding", false);
         		if (cp) di.coding = cp;
 
 		        s.Config[i].Localize = INI_GetValue(cfg, "gammu", "gammuloc", false);
         		if (s.Config[i].Localize) {
 				s.msg=INI_ReadFile(s.Config[i].Localize, true);
 			} else {
-#if !defined(WIN32) && defined(LOCALE_PATH)
+#if !defined(WIN32) && !defined(DJGPP) && defined(LOCALE_PATH)
  				locale = setlocale(LC_MESSAGES, NULL);
  				if (locale != NULL) {
 					snprintf(locale_file, 200, "%s/gammu_%c%c.txt",
 							LOCALE_PATH,
 							tolower(locale[0]),
 							tolower(locale[1]));
 					s.msg = INI_ReadFile(locale_file, true);
 				}
 #endif
 			}
 		}
 
 		/* Wanted user specific configuration? */
-
 		if (only_config != -1) {
 			/* Here we get only in first for loop */
 			if (!GSM_ReadConfig(cfg, &s.Config[0], only_config)) break;
 		} else {
 			if (!GSM_ReadConfig(cfg, &s.Config[i], i) && i != 0) break;
 		}
 		s.ConfigNum++;
 
      		/* We want to use only one file descriptor for global and state machine debug output */
  	    	s.Config[i].UseGlobalDebugFile = true;
 		
 		/* It makes no sense to open several debug logs... */
@@ -8348,85 +8475,60 @@ int main(int argc, char *argv[])
 			} else {
 				/* Try to set debug level from config file */
 				GSM_SetDebugLevel(s.Config[i].DebugLevel, &di);
 			}
 			/* If user gave debug file in gammurc, we will use it */
 			error=GSM_SetDebugFile(s.Config[i].DebugFile, &di);
 			Print_Error(error);
  		}
 
  		/* We wanted to read just user specified configuration. */
  		if (only_config != -1) {break;}
  	}
-#if 0
- GSM_Config *con = &s.Config[0];
-
-    char* tempC;
-    tempC = argv[argc-1]+2;
-    if ( *tempC != 0 ) {
-        fprintf(stderr,"Using model %s \n",tempC);
-		strcpy(con->Model,tempC );
-     }
-    tempC = argv[argc-2]+2;
-    if ( *tempC != 0 ) {
-        fprintf(stderr,"Using device %s \n",tempC);
-        con->Device = strdup(tempC);
-		con->DefaultDevice = false;
-     }
-    tempC = argv[argc-3]+2;
-    if ( *tempC != 0 ) {
-        fprintf(stderr,"Using connection %s \n",tempC);
-        con->Connection = strdup(tempC);
-		con->DefaultConnection = false;
-     }
-#endif
-
 
 	/* Do we have enough parameters? */
  	if (argc == 1 + start) {
  		HelpGeneral();
  		printmsg("Too few parameters!\n");
 		exit(-2);
 	}
 
 	/* Check used version vs. compiled */
 	if (!mystrncasecmp(GetGammuVersion(),VERSION,0)) {
 		printmsg("ERROR: version of installed libGammu.so (%s) is different to version of Gammu (%s)\n",
 					GetGammuVersion(),VERSION);
 		exit(-1);
 	}
 
 	/* Check parameters */
 	while (Parameters[z].Function != NULL) {
 		if (mystrncasecmp(Parameters[z].parameter,argv[1+start], 0)) {
 			if (argc-2-start >= Parameters[z].min_arg && argc-2-start <= Parameters[z].max_arg) {
-                fprintf(stderr,"Executing  \n");        
 				Parameters[z].Function(argc - start, argv + start);
  				break;
 			} else {
 				count_failed = true;
  			}
  		}
 		z++;
 	}
 
 	/* Tell user when we did nothing */
 	if (Parameters[z].Function == NULL) {
 		HelpGeneral();
 		if (count_failed) {
 			printmsg("Bad parameter count!\n");
 		} else {
 			printmsg("Bad option!\n");
  		}
  	}
 
      	/* Close debug output if opened */
      	if (di.df!=stdout) fclose(di.df);
-        //#endif // 0
-        fprintf(stderr,"kammu: Success. End.  \n");        
+
 	exit(0);
 }
 
 /* How should editor hadle tabs in this file? Add editor commands here.
  * vim: noexpandtab sw=8 ts=8 sts=8:
  */
 
diff --git a/gammu/emb/gammu/gammu.h b/gammu/emb/gammu/gammu.h
index d3de31b..ff50c9c 100644
--- a/gammu/emb/gammu/gammu.h
+++ b/gammu/emb/gammu/gammu.h
@@ -48,27 +48,27 @@ typedef struct {
  	char		*parameter;
  	int		min_arg;
  	int		max_arg;
  	void		(*Function) (int argc, char *argv[]);	
  	HelpCategory	help_cat[10];
  	char		*help;
 } GSM_Parameters;
 
 void	Print_Error		(GSM_Error error);
 void	GSM_Init		(bool checkerror);
 void	GSM_Terminate		(void);
 
-static  GSM_StateMachine	s;
-static	GSM_Phone_Functions	*Phone;
-static	GSM_Error		error;
+extern	GSM_StateMachine	s;
+extern	GSM_Phone_Functions	*Phone;
+extern	GSM_Error		error;
 
-static bool 		gshutdown;
+extern volatile bool 		gshutdown;
 
 void interrupt(int sign);
 
 #ifdef GSM_ENABLE_BEEP
 void	GSM_PhoneBeep		(void);
 #endif
 
 /* How should editor hadle tabs in this file? Add editor commands here.
  * vim: noexpandtab sw=8 ts=8 sts=8:
  */
diff --git a/gammu/emb/gammu/smsd/s_files.c b/gammu/emb/gammu/smsd/s_files.c
index dac8d9c..b791e58 100644
--- a/gammu/emb/gammu/smsd/s_files.c
+++ b/gammu/emb/gammu/smsd/s_files.c
@@ -1,13 +1,13 @@
-/* (c) 2002-2003 by Joergen Thomsen */
+/* (c) 2002-2004 by Joergen Thomsen */
 
 #include "../../cfg/config.h"
 
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
 #include <time.h>
 #ifdef WIN32
 #  include <io.h>
 #endif
 #if defined HAVE_DIRENT_H && defined HAVE_SCANDIR && defined HAVE_ALPHASORT
 #  include <dirent.h>
@@ -97,108 +97,150 @@ static GSM_Error SMSDFiles_SaveInboxSMS(GSM_MultiSMSMessage sms, GSM_SMSDConfig
 				WriteSMSDLog("%s %s", (sms.SMS[i].PDU == SMS_Status_Report?"Delivery report":"Received"), FileName);
 			} else {
 				WriteSMSDLog("Cannot save %s (%i)", FileName, errno);
 				return ERR_CANTOPENFILE;
 			}
 		}
 	}
 	return ERR_NONE;
 }
 
 /* Find one multi SMS to sending and return it (or return ERR_EMPTY)
  * There is also set ID for SMS
+ * File extension convention:
+ * OUTxxxxx.txt : normal text SMS
+ * Options appended to the extension applying to this SMS only:
+ * d: delivery report requested
+ * f: flash SMS
+ * b: WAP bookmark as name,URL
+ * e.g. OUTG20040620_193810_123_+4512345678_xpq.txtdf
+ * is a flash text SMS requesting delivery reports
  */
 static GSM_Error SMSDFiles_FindOutboxSMS(GSM_MultiSMSMessage *sms, GSM_SMSDConfig *Config, unsigned char *ID)
 {
   	GSM_Error			error = ERR_NOTSUPPORTED;
   	GSM_MultiPartSMSInfo		SMSInfo;
+	GSM_WAPBookmark			Bookmark;
  	unsigned char 			FileName[100],FullName[400];
 	unsigned char			Buffer[(GSM_MAX_SMS_LENGTH*MAX_MULTI_SMS+1)*2];
  	unsigned char			Buffer2[(GSM_MAX_SMS_LENGTH*MAX_MULTI_SMS+1)*2];
   	FILE				*File;
  	int				i, len, phlen;
- 	char				*pos1, *pos2;
+ 	char				*pos1, *pos2, *options;
 #if defined HAVE_DIRENT_H && defined HAVE_SCANDIR & defined HAVE_ALPHASORT
   	struct 				dirent **namelist = NULL;
   	int 				l, m ,n;
 
   	strcpy(FullName, Config->outboxpath);
   	FullName[strlen(Config->outboxpath)-1] = '\0';
   	n = scandir(FullName, &namelist, 0, alphasort);
   	m = 0;
- 	while ((m < n) && ((*(namelist[m]->d_name) == '.') ||
- 	                   !mystrncasecmp(namelist[m]->d_name,"out", 3) ||
+ 	while ((m < n) && ((*(namelist[m]->d_name) == '.') || // directory and UNIX hidden file
+ 	                   !mystrncasecmp(namelist[m]->d_name,"out", 3) || // must start with 'out'
  	                   ((strlen(namelist[m]->d_name) >= 4) &&
- 	                     !mystrncasecmp(&namelist[m]->d_name[strlen(namelist[m]->d_name)-4],".txt",4)
+ 	                    !mystrncasecmp(strrchr(namelist[m]->d_name, '.'),".txt",4)
  	                   )
  	                  )
  	      ) m++;
   	if (m < n) strcpy(FileName,namelist[m]->d_name);
   	for (l=0; l < n; l++) free(namelist[l]);
   	free(namelist);
   	namelist = NULL;
  	if (m >= n) return ERR_EMPTY;
 	error = ERR_NONE;
 #else
 #ifdef WIN32
   	struct _finddata_t 		c_file;
   	long 				hFile;
 
   	strcpy(FullName, Config->outboxpath);
-  	strcat(FullName, "OUT*.txt");
+  	strcat(FullName, "OUT*.txt*");
   	if((hFile = _findfirst( FullName, &c_file )) == -1L ) {
   		return ERR_EMPTY;
   	} else {
   		strcpy(FileName,c_file.name);
   	}
   	_findclose( hFile );
 	error = ERR_NONE;
 #endif
 #endif
 	if (error != ERR_NONE) return error;
-
+	options = strrchr(FileName, '.') + 4;
   	strcpy(FullName, Config->outboxpath);
   	strcat(FullName, FileName);
 
   	File = fopen(FullName, "rb");
  	len  = fread(Buffer, 1, sizeof(Buffer)-2, File);
   	fclose(File);
-  	if (len<2) return ERR_EMPTY;
 
- 	if ((Buffer[0] != 0xFF || Buffer[1] != 0xFE) &&
-	    (Buffer[0] != 0xFE || Buffer[1] != 0xFF)) {
+ 	if ((len <  2) || 
+            (len >= 2  && ((Buffer[0] != 0xFF || Buffer[1] != 0xFE) &&
+	                   (Buffer[0] != 0xFE || Buffer[1] != 0xFF)))) {
  		if (len > GSM_MAX_SMS_LENGTH*MAX_MULTI_SMS) len = GSM_MAX_SMS_LENGTH*MAX_MULTI_SMS;
  		EncodeUnicode(Buffer2, Buffer, len);
  		len = len*2;
  		memmove(Buffer, Buffer2, len);
  	}
 
   	Buffer[len] 	= 0;
   	Buffer[len+1] 	= 0;
   	ReadUnicodeFile(Buffer2,Buffer);
 
+    	GSM_ClearMultiPartSMSInfo(&SMSInfo);
+    	sms->Number = 0;
+
   	SMSInfo.ReplaceMessage  	= 0;
   	SMSInfo.Entries[0].Buffer	= Buffer2;
   	SMSInfo.Class			= -1;
 	SMSInfo.EntriesNum		= 1;
+	Config->currdeliveryreport	= -1;
+	if (strchr(options, 'd')) Config->currdeliveryreport	= 1;
+	if (strchr(options, 'f')) SMSInfo.Class 		= 0; /* flash SMS */
+
  	if (mystrncasecmp(Config->transmitformat, "unicode", 0)) {
  		SMSInfo.Entries[0].ID = SMS_ConcatenatedTextLong;
  		SMSInfo.UnicodeCoding = true;
  	} else if (mystrncasecmp(Config->transmitformat, "7bit", 0)) {
  		SMSInfo.Entries[0].ID = SMS_ConcatenatedTextLong;
  		SMSInfo.UnicodeCoding = false;
  	} else {
 		/* auto */
  		SMSInfo.Entries[0].ID = SMS_ConcatenatedAutoTextLong;
 	}
+
+	if (strchr(options, 'b')) { // WAP bookmark as title,URL
+		SMSInfo.Entries[0].Buffer		= NULL;
+		SMSInfo.Entries[0].Bookmark		= &Bookmark;
+		SMSInfo.Entries[0].ID			= SMS_NokiaWAPBookmarkLong;
+		SMSInfo.Entries[0].Bookmark->Location	= 0;
+		pos2 = mywstrstr(Buffer2, "\0,");
+		if (pos2 == NULL) {
+			pos2 = Buffer2;
+		} else {
+			*pos2 = '\0'; pos2++; *pos2 = '\0'; pos2++; // replace comma by zero
+		}
+
+		len = UnicodeLength(Buffer2);
+		if (len > 50) len = 50;
+		memmove(&SMSInfo.Entries[0].Bookmark->Title, Buffer2, len * 2);
+		pos1 = &SMSInfo.Entries[0].Bookmark->Title[0] + len * 2;
+		*pos1 = '\0'; pos1++; *pos1 = '\0';
+
+		len = UnicodeLength(pos2);
+		if (len > 255) len = 255;
+		memmove(&SMSInfo.Entries[0].Bookmark->Address, pos2, len * 2);
+		pos1 = &SMSInfo.Entries[0].Bookmark->Address[0] + len * 2;
+		*pos1 = '\0'; pos1++; *pos1 = '\0';
+	}
+
   	GSM_EncodeMultiPartSMS(&SMSInfo,sms);
 
  	pos1 = FileName;
 	strcpy(ID,FileName);
  	for (i = 1; i <= 3 && pos1 != NULL ; i++) pos1 = strchr(++pos1, '_');
  	if (pos1 != NULL) {
 		/* OUT<priority><date>_<time>_<serialno>_<phone number>_<anything>.txt */
  		pos2 = strchr(++pos1, '_');
  		if (pos2 != NULL) {
  			phlen = strlen(pos1) - strlen(pos2);
  		} else {
 			/* something wrong */
@@ -221,33 +263,35 @@ static GSM_Error SMSDFiles_FindOutboxSMS(GSM_MultiSMSMessage *sms, GSM_SMSDConfi
  	} else {
 		/* something wrong */
 		return ERR_UNKNOWN;
 	}
 
  	for (len=0;len<sms->Number;len++) {
  		EncodeUnicode(sms->SMS[len].Number, pos1, phlen);
  	}
 
 #ifdef DEBUG
 	if (sms->Number != 0) {
 		DecodeUnicode(sms->SMS[0].Number,Buffer);
-	 	dbgprintf("Found %i sms to \"%s\" with text \"%s\" cod %i lgt %i udh: t %i l %i\n",
+	 	dbgprintf("Found %i sms to \"%s\" with text \"%s\" cod %i lgt %i udh: t %i l %i dlr: %i fls: %i",
 			sms->Number,
 			Buffer,
 	 		DecodeUnicodeString(sms->SMS[0].Text),
 			sms->SMS[0].Coding,
 			sms->SMS[0].Length,
 			sms->SMS[0].UDH.Type,
-			sms->SMS[0].UDH.Length);
-	} else dbgprintf("error\n");
+			sms->SMS[0].UDH.Length,
+			Config->currdeliveryreport,
+			SMSInfo.Class);
+	} else dbgprintf("error: SMS-count = 0");
 #endif
 
   	return ERR_NONE;
 }
 
 /* After sending SMS is moved to Sent Items or Error Items. */
 static GSM_Error SMSDFiles_MoveSMS(GSM_MultiSMSMessage *sms, GSM_SMSDConfig *Config, unsigned char *ID, bool alwaysDelete, bool sent)
 {
 	FILE 	*oFile,*iFile;
 	int 	ilen = 0, olen = 0;
 	char 	Buffer[(GSM_MAX_SMS_LENGTH*MAX_MULTI_SMS+1)*2],ifilename[400],ofilename[400];
 	char	*sourcepath, *destpath;
@@ -283,31 +327,34 @@ static GSM_Error SMSDFiles_MoveSMS(GSM_MultiSMSMessage *sms, GSM_SMSDConfig *Con
 		}
 		return ERR_NONE;
 	} else {
 		WriteSMSDLog("Error copying SMS %s -> %s", ifilename, ofilename);
 		if (alwaysDelete) {
 			if ((strcmp(ifilename, "/") == 0) || (remove(ifilename) != 0))
 				WriteSMSDLog("Could not delete %s (%i)", ifilename, errno);
 		}
 		return ERR_UNKNOWN;
 	}
 }
 
-static GSM_Error SMSDFiles_AddSentSMSInfo(GSM_MultiSMSMessage *sms, GSM_SMSDConfig *Config, unsigned char *ID, int Part, bool OK)
+static GSM_Error SMSDFiles_AddSentSMSInfo(GSM_MultiSMSMessage *sms, GSM_SMSDConfig *Config, unsigned char *ID, int Part, GSM_SMSDSendingError err, int TPMR)
 {
-	if (OK) WriteSMSDLog("Transmitted %s (%s: %i) to %s", Config->SMSID, (Part == sms->Number?"total":"part"),Part,DecodeUnicodeString(sms->SMS[0].Number));
+	if (err == SMSD_SEND_OK) WriteSMSDLog("Transmitted %s (%s: %i) to %s", Config->SMSID, (Part == sms->Number?"total":"part"),Part,DecodeUnicodeString(sms->SMS[0].Number));
 
   	return ERR_NONE;
 }
 
 GSM_SMSDService SMSDFiles = {
 	NONEFUNCTION,			/* Init 		*/
+	NONEFUNCTION,			/* InitAfterConnect 	*/
 	SMSDFiles_SaveInboxSMS,
 	SMSDFiles_FindOutboxSMS,
 	SMSDFiles_MoveSMS,
 	NOTSUPPORTED,			/* CreateOutboxSMS	*/
-	SMSDFiles_AddSentSMSInfo
+	SMSDFiles_AddSentSMSInfo,
+	NOTSUPPORTED,			/* RefreshSendStatus	*/
+	NOTSUPPORTED			/* RefreshPhoneStatus	*/
 };
 
-/* How should editor hadle tabs in this file? Add editor commands here.
+/* How should editor handle tabs in this file? Add editor commands here.
  * vim: noexpandtab sw=8 ts=8 sts=8:
  */
diff --git a/gammu/emb/gammu/smsd/s_files.h b/gammu/emb/gammu/smsd/s_files.h
index 5cfa05f..ed07ef3 100644
--- a/gammu/emb/gammu/smsd/s_files.h
+++ b/gammu/emb/gammu/smsd/s_files.h
@@ -1,7 +1,7 @@
-/* (c) 2002-2003 by Joergen Thomsen */
+/* (c) 2002-2004 by Joergen Thomsen */
 
 extern GSM_SMSDService SMSDFiles;
 
 /* How should editor hadle tabs in this file? Add editor commands here.
  * vim: noexpandtab sw=8 ts=8 sts=8:
  */
diff --git a/gammu/emb/gammu/smsd/s_mysql.c b/gammu/emb/gammu/smsd/s_mysql.c
index dacc256..5df15e9 100644
--- a/gammu/emb/gammu/smsd/s_mysql.c
+++ b/gammu/emb/gammu/smsd/s_mysql.c
@@ -6,54 +6,242 @@
 
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
 #include <time.h>
 #ifdef WIN32
 #  include <windows.h>
 #  pragma comment(lib, "libmysql.lib")
 #endif
 
 #include "../../common/misc/coding/coding.h"
 #include "../../common/service/backup/gsmback.h"
+#include "../gammu.h"
 #include "smsdcore.h"
 
 /* Connects to database */
 static GSM_Error SMSDMySQL_Init(GSM_SMSDConfig *Config)
 {
+	unsigned char		buf[400];
+	MYSQL_RES 		*Res;
+	MYSQL_ROW 		Row;
+
 	mysql_init(&Config->DB);
 	if (!mysql_real_connect(&Config->DB,Config->PC,Config->user,Config->password,Config->database,0,NULL,0)) {
 	    WriteSMSDLog("Error connecting to database: %s\n", mysql_error(&Config->DB));
 	    return ERR_UNKNOWN;
 	}
+	sprintf(buf, "SELECT ID FROM `outbox` WHERE 1");
+	if (mysql_real_query(&Config->DB,buf,strlen(buf))) {
+		WriteSMSDLog("No table for outbox sms: %s\n", mysql_error(&Config->DB));
+		return ERR_UNKNOWN;
+	}
+	if (!(Res = mysql_store_result(&Config->DB))) {
+		WriteSMSDLog("No table for outbox sms: %s\n", mysql_error(&Config->DB));
+		return ERR_UNKNOWN;
+	}
+	mysql_free_result(Res);
+	sprintf(buf, "SELECT ID FROM `outbox_multipart` WHERE 1");
+	if (mysql_real_query(&Config->DB,buf,strlen(buf))) {
+		WriteSMSDLog("No table for outbox sms: %s\n", mysql_error(&Config->DB));
+		return ERR_UNKNOWN;
+	}
+	if (!(Res = mysql_store_result(&Config->DB))) {
+		WriteSMSDLog("No table for outbox sms: %s\n", mysql_error(&Config->DB));
+		return ERR_UNKNOWN;
+	}
+	mysql_free_result(Res);
+	sprintf(buf, "SELECT ID FROM `sentitems` WHERE 1");
+	if (mysql_real_query(&Config->DB,buf,strlen(buf))) {
+		WriteSMSDLog("No table for sent sms: %s\n", mysql_error(&Config->DB));
+		return ERR_UNKNOWN;
+	}
+	if (!(Res = mysql_store_result(&Config->DB))) {
+		WriteSMSDLog("No table for sent sms: %s\n", mysql_error(&Config->DB));
+		return ERR_UNKNOWN;
+	}
+	mysql_free_result(Res);
+	sprintf(buf, "SELECT ID FROM `inbox` WHERE 1");
+	if (mysql_real_query(&Config->DB,buf,strlen(buf))) {
+		WriteSMSDLog("No table for inbox sms: %s\n", mysql_error(&Config->DB));
+		return ERR_UNKNOWN;
+	}
+	if (!(Res = mysql_store_result(&Config->DB))) {
+		WriteSMSDLog("No table for inbox sms: %s\n", mysql_error(&Config->DB));
+		return ERR_UNKNOWN;
+	}
+	mysql_free_result(Res);
+	sprintf(buf, "SELECT Version FROM `gammu` WHERE 1");
+	if (mysql_real_query(&Config->DB,buf,strlen(buf))) {
+		WriteSMSDLog("No Gammu table: %s\n", mysql_error(&Config->DB));
+		return ERR_UNKNOWN;
+	}
+	if (!(Res = mysql_store_result(&Config->DB))) {
+		WriteSMSDLog("No Gammu table: %s\n", mysql_error(&Config->DB));
+		return ERR_UNKNOWN;
+	}
+	if (!(Row = mysql_fetch_row(Res))) {
+		mysql_free_result(Res);
+		WriteSMSDLog("No version info in Gammu table: %s\n", mysql_error(&Config->DB));
+		return ERR_UNKNOWN;
+	}
+	if (atoi(Row[0]) > 4) {
+		mysql_free_result(Res);
+		WriteSMSDLog("DataBase structures are from higher Gammu version");
+		WriteSMSDLog("Please update this client application");
+		return ERR_UNKNOWN;
+	}
+	if (atoi(Row[0]) < 4) {
+		mysql_free_result(Res);
+		WriteSMSDLog("DataBase structures are from older Gammu version");
+		WriteSMSDLog("Please update DataBase, if you want to use this client application");
+		return ERR_UNKNOWN;
+	}
+	mysql_free_result(Res);
+
+	return ERR_NONE;
+}
+
+static GSM_Error SMSDMySQL_InitAfterConnect(GSM_SMSDConfig *Config)
+{
+	unsigned char buf[400],buf2[200];
+
+	sprintf(buf,"DELETE FROM `phones` WHERE `IMEI` = '%s'",s.Phone.Data.IMEI);
+#ifdef DEBUG
+	fprintf(stdout,"%s\n",buf);
+#endif
+	if (mysql_real_query(&Config->DB,buf,strlen(buf))) {
+		WriteSMSDLog("Error deleting from database (Init): %d %s\n", mysql_errno(&Config->DB), mysql_error(&Config->DB));
+		return ERR_UNKNOWN;
+	}
+
+	sprintf(buf2,"Gammu %s",VERSION);
+	if (strlen(GetOS()) != 0) {
+		strcat(buf2+strlen(buf2),", ");
+		strcat(buf2+strlen(buf2),GetOS());
+	}
+	if (strlen(GetCompiler()) != 0) {
+		strcat(buf2+strlen(buf2),", ");
+		strcat(buf2+strlen(buf2),GetCompiler());
+	}
+
+	sprintf(buf,"INSERT INTO `phones` (`IMEI`,`ID`,`Send`,`Receive`,`InsertIntoDB`,`TimeOut`,`Client`) VALUES ('%s','%s','yes','yes',NOW(),(NOW() + INTERVAL 10 SECOND)+0,'%s')",s.Phone.Data.IMEI,Config->PhoneID,buf2);
+#ifdef DEBUG
+	fprintf(stdout,"%s\n",buf);
+#endif
+	if (mysql_real_query(&Config->DB,buf,strlen(buf))) {
+		WriteSMSDLog("Error deleting from database (Init): %d %s\n", mysql_errno(&Config->DB), mysql_error(&Config->DB));
+		return ERR_UNKNOWN;
+	}
+
 	return ERR_NONE;
 }
 
 /* Save SMS from phone (called Inbox sms - it's in phone Inbox) somewhere */
 static GSM_Error SMSDMySQL_SaveInboxSMS(GSM_MultiSMSMessage sms, GSM_SMSDConfig *Config)
 {
-	unsigned char	buffer[10000],buffer2[200],buffer3[2];
+	MYSQL_RES 		*Res;
+	MYSQL_ROW 		Row;
+	unsigned char		buffer[10000],buffer2[200],buffer3[50];
 	int 		i,j,z;
+	GSM_DateTime		DT;
+	time_t     		t_time1,t_time2;
+	bool			found;
+	long 			diff;
 
 	for (i=0;i<sms.Number;i++) {
-		if ((sms.SMS[i].PDU == SMS_Status_Report) && mystrncasecmp(Config->deliveryreport, "log", 3)) {
-			strcpy(buffer, DecodeUnicodeString(sms.SMS[i].Number));
-			WriteSMSDLog("Delivery report: %s to %s", DecodeUnicodeString(sms.SMS[i].Text), buffer);
+		if (sms.SMS[i].PDU == SMS_Status_Report) {
+			strcpy(buffer2, DecodeUnicodeString(sms.SMS[i].Number));
+			if (mystrncasecmp(Config->deliveryreport, "log", 3)) {
+				WriteSMSDLog("Delivery report: %s to %s", DecodeUnicodeString(sms.SMS[i].Text), buffer2);
+			}
+
+			sprintf(buffer, "SELECT ID,Status,SendingDateTime,DeliveryDateTime,SMSCNumber FROM `sentitems` WHERE \
+					DeliveryDateTime='00000000000000' AND \
+					SenderID='%s' AND TPMR='%i' AND DestinationNumber='%s'",
+					Config->PhoneID, sms.SMS[i].MessageReference, buffer2);
+#ifdef DEBUG
+			fprintf(stdout,"%s\n",buffer);
+#endif
+			if (mysql_real_query(&Config->DB,buffer,strlen(buffer))) {
+				WriteSMSDLog("Error reading from database (SaveInbox): %s %s\n", buffer, mysql_error(&Config->DB));
+				return ERR_UNKNOWN;
+			}
+			if (!(Res = mysql_store_result(&Config->DB))) {
+				WriteSMSDLog("Error reading from database (SaveInbox): %s\n", mysql_error(&Config->DB));
+				return ERR_UNKNOWN;
+			}
+			found = false;
+			while ((Row = mysql_fetch_row(Res))) {
+				if (strcmp(Row[4],DecodeUnicodeString(sms.SMS[i].SMSC.Number))) {
+					if (Config->skipsmscnumber[0] == 0) continue;
+					if (strcmp(Config->skipsmscnumber,Row[4])) continue;
+				}
+				if (!strcmp(Row[1],"SendingOK") || !strcmp(Row[1],"DeliveryPending")) {
+					sprintf(buffer,"%c%c%c%c",Row[2][0],Row[2][1],Row[2][2],Row[2][3]);
+					DT.Year = atoi(buffer);
+					sprintf(buffer,"%c%c",Row[2][4],Row[2][5]);
+					DT.Month = atoi(buffer);
+					sprintf(buffer,"%c%c",Row[2][6],Row[2][7]);
+					DT.Day = atoi(buffer);
+					sprintf(buffer,"%c%c",Row[2][8],Row[2][9]);
+					DT.Hour = atoi(buffer);
+					sprintf(buffer,"%c%c",Row[2][10],Row[2][11]);
+					DT.Minute = atoi(buffer);
+					sprintf(buffer,"%c%c",Row[2][12],Row[2][13]);
+					DT.Second = atoi(buffer);
+					t_time1 = Fill_Time_T(DT,0);
+					t_time2 = Fill_Time_T(sms.SMS[i].DateTime,0);
+					diff = t_time2 - t_time1;
+	//				fprintf(stderr,"diff is %i, %i-%i-%i-%i-%i and %i-%i-%i-%i-%i-%i\n",diff,
+	//					DT.Year,DT.Month,DT.Day,DT.Hour,DT.Minute,DT.Second,
+	//					sms.SMS[i].DateTime.Year,sms.SMS[i].DateTime.Month,sms.SMS[i].DateTime.Day,sms.SMS[i].DateTime.Hour,sms.SMS[i].DateTime.Minute,sms.SMS[i].DateTime.Second);
+					if (diff > -10 && diff < 10) {
+						found = true;
+						break;
+					}
+				}	
+			}
+			if (found) {
+				sprintf(buffer,"UPDATE `sentitems` SET `DeliveryDateTime`='%04i%02i%02i%02i%02i%02i', `Status`='",
+					sms.SMS[i].SMSCTime.Year,sms.SMS[i].SMSCTime.Month,sms.SMS[i].SMSCTime.Day,
+					sms.SMS[i].SMSCTime.Hour,sms.SMS[i].SMSCTime.Minute,sms.SMS[i].SMSCTime.Second);
+				sprintf(buffer3,"%s",DecodeUnicodeString(sms.SMS[i].Text));
+				if (!strcmp(buffer3,"Delivered")) {
+					sprintf(buffer+strlen(buffer),"DeliveryOK");
+				} else if (!strcmp(buffer3,"Failed")) {
+					sprintf(buffer+strlen(buffer),"DeliveryFailed");
+				} else if (!strcmp(buffer3,"Pending")) {
+					sprintf(buffer+strlen(buffer),"DeliveryPending");
+				} else if (!strcmp(buffer3,"Unknown")) {
+					sprintf(buffer+strlen(buffer),"DeliveryUnknown");
+				}
+				sprintf(buffer+strlen(buffer),"', `StatusError` = '%i'",sms.SMS[i].DeliveryStatus);
+				sprintf(buffer+strlen(buffer)," WHERE `ID` = '%s' AND `TPMR` = '%i'",Row[0],sms.SMS[i].MessageReference);
+#ifdef DEBUG
+				fprintf(stdout,"%s\n",buffer);
+#endif
+				if (mysql_real_query(&Config->DB,buffer,strlen(buffer))) {
+					WriteSMSDLog("Error writing to database (SaveInboxSMS): %d %s\n", mysql_errno(&Config->DB), mysql_error(&Config->DB));
+					return ERR_UNKNOWN;
+				}
+			}
+			mysql_free_result(Res);
 			continue;
 		}
 		if (sms.SMS[i].PDU != SMS_Deliver) continue;
 		buffer[0]=0;
-		sprintf(buffer+strlen(buffer),"INSERT INTO `Inbox` \
-			(`DateTime`,`Text`,`SenderNumber`,`Coding`,`SMSCNumber`,`UDH`, \
-			`Class`,`TextDecoded`) VALUES ('%04d%02d%02d%02d%02d%02d','",
+		sprintf(buffer+strlen(buffer),"INSERT INTO `inbox` \
+			(`ReceivingDateTime`,`Text`,`SenderNumber`,`Coding`,`SMSCNumber`,`UDH`, \
+			`Class`,`TextDecoded`,`RecipientID`) VALUES ('%04d%02d%02d%02d%02d%02d','",
 			sms.SMS[i].DateTime.Year,sms.SMS[i].DateTime.Month,sms.SMS[i].DateTime.Day,
 			sms.SMS[i].DateTime.Hour,sms.SMS[i].DateTime.Minute,sms.SMS[i].DateTime.Second);
 		switch (sms.SMS[i].Coding) {
 		case SMS_Coding_Unicode:
 	    	case SMS_Coding_Default:
 			EncodeHexUnicode(buffer+strlen(buffer),sms.SMS[i].Text,UnicodeLength(sms.SMS[i].Text));
 			break;
 		case SMS_Coding_8bit:
 			EncodeHexBin(buffer+strlen(buffer),sms.SMS[i].Text,sms.SMS[i].Length);
 		}
 		sprintf(buffer+strlen(buffer),"','%s','",DecodeUnicodeString(sms.SMS[i].Number));
 		switch (sms.SMS[i].Coding) {
@@ -87,328 +275,450 @@ static GSM_Error SMSDMySQL_SaveInboxSMS(GSM_MultiSMSMessage sms, GSM_SMSDConfig
 				    buffer[z+2]=0;
 				    buffer[z+1]=buffer2[j];
 				    buffer[z]  ='\\';
 				} else {
 				    buffer[z+1]=0;
 				    buffer[z]  =buffer2[j];
 				}
 			}
 			break;
 		case SMS_Coding_8bit:
 			break;
 		}
-		sprintf(buffer+strlen(buffer),"')");
+		sprintf(buffer+strlen(buffer),"','%s')",Config->PhoneID);
+#ifdef DEBUG
+		fprintf(stdout,"%s\n",buffer);
+#endif
 		if (mysql_real_query(&Config->DB,buffer,strlen(buffer))) {
-			WriteSMSDLog("Error writing to database: %d %s\n", mysql_errno(&Config->DB), mysql_error(&Config->DB));
+			WriteSMSDLog("Error writing to database (SaveInbox): %d %s\n", mysql_errno(&Config->DB), mysql_error(&Config->DB));
 			return ERR_UNKNOWN;
 		}
 	}
 
 	return ERR_NONE;
 }
 
+static GSM_Error SMSDMySQL_RefreshSendStatus(GSM_SMSDConfig *Config, unsigned char *ID)
+{
+	unsigned char buffer[10000];
+
+	sprintf(buffer,"UPDATE `outbox` SET `SendingTimeOut`=(now() + INTERVAL 15 SECOND)+0 WHERE `ID` = '%s' AND `SendingTimeOut` < now()",ID);
+	if (mysql_real_query(&Config->DB,buffer,strlen(buffer))) {
+		WriteSMSDLog("Error writing to database (RefreshSendStatus): %d %s\n", mysql_errno(&Config->DB), mysql_error(&Config->DB));
+		return ERR_UNKNOWN;
+	}
+#ifdef DEBUG
+	fprintf(stdout,"%s\n",buffer);
+#endif	
+	if (mysql_affected_rows(&Config->DB) == 0) return ERR_UNKNOWN;
+  	return ERR_NONE;
+}
+
 /* Find one multi SMS to sending and return it (or return ERR_EMPTY)
  * There is also set ID for SMS
  */
 static GSM_Error SMSDMySQL_FindOutboxSMS(GSM_MultiSMSMessage *sms, GSM_SMSDConfig *Config, unsigned char *ID)
 {
 	unsigned char 	buf[400];
 	MYSQL_RES 	*Res;
 	MYSQL_ROW 	Row;
 	int 		i;
+	bool			found = false;
 
-	sprintf(buf, "SELECT ID,DateTime FROM `Outbox` WHERE 1");
+	sprintf(buf, "SELECT ID,InsertIntoDB,SendingDateTime,SenderID FROM `outbox` WHERE SendingDateTime < NOW() AND SendingTimeOut < NOW()");
 	if (mysql_real_query(&Config->DB,buf,strlen(buf))) {
-		WriteSMSDLog("Error reading from database: %s\n", mysql_error(&Config->DB));
+		WriteSMSDLog("Error reading from database (FindOutbox): %s\n", mysql_error(&Config->DB));
 		return ERR_UNKNOWN;
 	}
 	if (!(Res = mysql_store_result(&Config->DB))) {
-		WriteSMSDLog("Error reading from database: %s\n", mysql_error(&Config->DB));
+		WriteSMSDLog("Error reading from database (FindOutbox): %s\n", mysql_error(&Config->DB));
 		return ERR_UNKNOWN;
 	}
-	if (!(Row = mysql_fetch_row(Res))) {
+	while ((Row = mysql_fetch_row(Res))) {
+		sprintf(ID,"%s",Row[0]);
+		sprintf(Config->DT,"%s",Row[1]);
+		if (strlen(Row[3]) == 0 || !strcmp(Row[3],Config->PhoneID)) {
+			if (SMSDMySQL_RefreshSendStatus(Config, ID)==ERR_NONE) {
+				found = true;
+				break;
+			}
+		}
+	}
+	if (!found) {
 		mysql_free_result(Res);
 		return ERR_EMPTY;
 	}
-	sprintf(ID,"%s",Row[0]);
-	sprintf(Config->DT,"%s",Row[1]);
+	mysql_free_result(Res);
 	sms->Number = 0;
-	for (i=1;i<10;i++) {
-		GSM_SetDefaultSMSData(&sms->SMS[sms->Number]);
+	for (i=0;i<MAX_MULTI_SMS;i++) {
+		GSM_SetDefaultSMSData(&sms->SMS[i]);
+		sms->SMS[i].SMSC.Number[0] = 0;
+		sms->SMS[i].SMSC.Number[1] = 0;
+	}
+	for (i=1;i<MAX_MULTI_SMS+1;i++) {
 		if (i==1) {
-			sprintf(buf, "SELECT Text,DestinationNumber,Coding,UDH,SMSCNumber,Class,TextDecoded,ID,MultiPart FROM `Outbox` WHERE ID='%s'",ID);
+			sprintf(buf, "SELECT Text,Coding,UDH,Class,TextDecoded,ID,DestinationNumber,MultiPart,RelativeValidity,DeliveryReport FROM `outbox` WHERE ID='%s'",ID);
 		} else {
-			sprintf(buf, "SELECT Text,DestinationNumber,Coding,UDH,SMSCNumber,Class,TextDecoded,ID,SequencePosition FROM `Outbox_MultiPart` WHERE ID='%s' AND SequencePosition='%i'",ID,i);
+			sprintf(buf, "SELECT Text,Coding,UDH,Class,TextDecoded,ID,SequencePosition FROM `outbox_multipart` WHERE ID='%s' AND SequencePosition='%i'",ID,i);
 		}
+#ifdef DEBUG
+		fprintf(stdout,"%s\n",buf);
+#endif
     		if (mysql_real_query(&Config->DB,buf,strlen(buf))) {
-			WriteSMSDLog("Error reading from database: %s\n", mysql_error(&Config->DB));
+			WriteSMSDLog("Error reading from database (FindOutbox): %s\n", mysql_error(&Config->DB));
 			return ERR_UNKNOWN;
 		}
 		if (!(Res = mysql_store_result(&Config->DB))) {
-			WriteSMSDLog("Error reading from database: %s\n", mysql_error(&Config->DB));
+			WriteSMSDLog("Error reading from database (FindOutbox): %s\n", mysql_error(&Config->DB));
 			return ERR_UNKNOWN;
 		}
 		if (!(Row = mysql_fetch_row(Res))) {
 	    		mysql_free_result(Res);
 			return ERR_NONE;
 		}
 
 		sms->SMS[sms->Number].Coding=SMS_Coding_Default;
-		if (!strcmp(Row[2],"Unicode")) sms->SMS[sms->Number].Coding=SMS_Coding_Unicode;
-		if (!strcmp(Row[2],"8bit"))    sms->SMS[sms->Number].Coding=SMS_Coding_8bit;
+		if (!strcmp(Row[1],"Unicode")) sms->SMS[sms->Number].Coding=SMS_Coding_Unicode;
+		if (!strcmp(Row[1],"8bit"))    sms->SMS[sms->Number].Coding=SMS_Coding_8bit;
 
 		if (strlen(Row[0])==0) {
-			EncodeUnicode(sms->SMS[sms->Number].Text,Row[6],strlen(Row[6]));
+			EncodeUnicode(sms->SMS[sms->Number].Text,Row[4],strlen(Row[4]));
 		} else {
 			switch (sms->SMS[sms->Number].Coding) {
 			case SMS_Coding_Unicode:
 			case SMS_Coding_Default:
 				DecodeHexUnicode(sms->SMS[sms->Number].Text,Row[0],strlen(Row[0]));
 				break;
 			case SMS_Coding_8bit:
 				DecodeHexBin(sms->SMS[sms->Number].Text,Row[0],strlen(Row[0]));
 				sms->SMS[sms->Number].Length=strlen(Row[0])/2;
 			}
 		}	    
-		EncodeUnicode(sms->SMS[sms->Number].Number,Row[1],strlen(Row[1]));
+		if (i == 1) {
+			EncodeUnicode(sms->SMS[sms->Number].Number,Row[6],strlen(Row[6]));
+		} else {
+			CopyUnicodeString(sms->SMS[sms->Number].Number,sms->SMS[0].Number);
+		}
 		sms->SMS[sms->Number].UDH.Type = UDH_NoUDH;
-		if (strlen(Row[3])!=0) {
+		if (strlen(Row[2])!=0) {
 			sms->SMS[sms->Number].UDH.Type 		= UDH_UserUDH;
-			sms->SMS[sms->Number].UDH.Length 	= strlen(Row[3])/2;
-			DecodeHexBin(sms->SMS[sms->Number].UDH.Text,Row[3],strlen(Row[3]));
+			sms->SMS[sms->Number].UDH.Length 	= strlen(Row[2])/2;
+			DecodeHexBin(sms->SMS[sms->Number].UDH.Text,Row[2],strlen(Row[2]));
 		}
-		EncodeUnicode(sms->SMS[sms->Number].SMSC.Number,Row[4],strlen(Row[4]));
-		sms->SMS[sms->Number].Class		= atoi(Row[5]);
+		sms->SMS[sms->Number].Class		= atoi(Row[3]);
 		sms->SMS[sms->Number].PDU  		= SMS_Submit;
-		sms->SMS[sms->Number].SMSC.Location = 0;
 		sms->Number++;	    
-		if (i == 1 && !strcmp(Row[8],"false")) break;
+		if (i==1) {
+			Config->relativevalidity = atoi(Row[8]);
+
+			Config->currdeliveryreport = -1;
+			if (!strcmp(Row[9],"yes")) {
+				Config->currdeliveryreport = 1;
+			} else if (!strcmp(Row[9],"no")) {
+				Config->currdeliveryreport = 0;
 	}
+
+			if (!strcmp(Row[7],"false")) break;
+
+		}
+	}
+	mysql_free_result(Res);	
   	return ERR_NONE;
 }
 
 /* After sending SMS is moved to Sent Items or Error Items. */
 static GSM_Error SMSDMySQL_MoveSMS(GSM_MultiSMSMessage *sms, GSM_SMSDConfig *Config, unsigned char *ID, bool alwaysDelete, bool sent)
 {
-	char 		*status;
-	unsigned char	buffer[10000],buffer2[200],buffer3[2];
-	int 		i,j,z;
+	unsigned char buffer[10000];
+
+	sprintf(buffer,"DELETE FROM `outbox` WHERE `ID` = '%s'",ID);
+	if (mysql_real_query(&Config->DB,buffer,strlen(buffer))) {
+		WriteSMSDLog("Error deleting from database (MoveSMS): %d %s\n", mysql_errno(&Config->DB), mysql_error(&Config->DB));
+		return ERR_UNKNOWN;
+	}
+	sprintf(buffer,"DELETE FROM `outbox_multipart` WHERE `ID` = '%s'",ID);
+	if (mysql_real_query(&Config->DB,buffer,strlen(buffer))) {
+		WriteSMSDLog("Error deleting from database (MoveSMS): %d %s\n", mysql_errno(&Config->DB), mysql_error(&Config->DB));
+		return ERR_UNKNOWN;
+	}
+  	return ERR_NONE;
+}
+
+/* Adds SMS to Outbox */
+static GSM_Error SMSDMySQL_CreateOutboxSMS(GSM_MultiSMSMessage *sms, GSM_SMSDConfig *Config)
+{
+	unsigned char		buffer[10000],buffer2[200],buffer3[2],buffer4[10000];
+	int 			i,j,z,ID;
+	MYSQL_RES 		*Res;
+	MYSQL_ROW 		Row;
 	
-	if (sent) status = "OK"; else status = "Error";
+	sprintf(buffer,"SELECT ID FROM outbox ORDER BY ID DESC LIMIT 1");
+	if (mysql_real_query(&Config->DB,buffer,strlen(buffer))) {
+		WriteSMSDLog("Error reading from database (CreateOutbox): %s\n", mysql_error(&Config->DB));
+		return ERR_UNKNOWN;
+	}
+	if (!(Res = mysql_store_result(&Config->DB))) {
+		WriteSMSDLog("Error reading from database (CreateOutbox): %s\n", mysql_error(&Config->DB));
+		return ERR_UNKNOWN;
+	}
+	if ((Row = mysql_fetch_row(Res))) {
+		sprintf(buffer,"%s",Row[0]);
+		ID = atoi(buffer);
+	} else {
+		ID = 0; 
+	}
+	mysql_free_result(Res);	
 
 	for (i=0;i<sms->Number;i++) {
 		buffer[0]=0;
-		sprintf(buffer+strlen(buffer),"UPDATE `SentItems` SET `Text`='");
+		if (i==0) {
+			sprintf(buffer+strlen(buffer),"INSERT INTO `outbox` (`DeliveryReport`,`MultiPart`,`InsertIntoDB");
+		} else {
+			sprintf(buffer+strlen(buffer),"INSERT INTO `outbox_multipart` (`SequencePosition");
+		}
+		sprintf(buffer+strlen(buffer),"`,`Text`,");
+		if (i==0) {
+			sprintf(buffer+strlen(buffer),"`DestinationNumber`,`RelativeValidity`,");
+		}
+		sprintf(buffer+strlen(buffer),"`Coding`,`UDH`, \
+			`Class`,`TextDecoded`,`ID`) VALUES ('");
+		if (i==0) {
+			if (sms->SMS[i].PDU == SMS_Status_Report) {
+				sprintf(buffer+strlen(buffer),"yes','");
+			} else {
+				sprintf(buffer+strlen(buffer),"default','");
+			}
+			if (sms->Number == 1) {
+				sprintf(buffer+strlen(buffer),"false");
+			} else {
+				sprintf(buffer+strlen(buffer),"true");
+			}
+			sprintf(buffer+strlen(buffer),"',NOW()");
+		} else {
+			sprintf(buffer+strlen(buffer),"%i'",i+1);
+		}
+		sprintf(buffer+strlen(buffer),",'");
 
 		switch (sms->SMS[i].Coding) {
 		case SMS_Coding_Unicode:
 	    	case SMS_Coding_Default:
 			EncodeHexUnicode(buffer+strlen(buffer),sms->SMS[i].Text,UnicodeLength(sms->SMS[i].Text));
 			break;
 		case SMS_Coding_8bit:
 			EncodeHexBin(buffer+strlen(buffer),sms->SMS[i].Text,sms->SMS[i].Length);
 		}
-
-		sprintf(buffer+strlen(buffer),"',`DestinationNumber`='%s',`Coding`='",DecodeUnicodeString(sms->SMS[i].Number));
-
+		sprintf(buffer+strlen(buffer),"',");
+		if (i==0) {
+			sprintf(buffer+strlen(buffer),"'%s',",DecodeUnicodeString(sms->SMS[i].Number));
+			if (sms->SMS[i].SMSC.Validity.Format == SMS_Validity_RelativeFormat) {
+				sprintf(buffer+strlen(buffer),"'%i',",sms->SMS[i].SMSC.Validity.Relative);
+			} else {
+				sprintf(buffer+strlen(buffer),"'-1',");
+			}
+		}
+		sprintf(buffer+strlen(buffer),"'");
 		switch (sms->SMS[i].Coding) {
 		case SMS_Coding_Unicode:
 			sprintf(buffer+strlen(buffer),"Unicode");
 			break;
 	    	case SMS_Coding_Default:
 			sprintf(buffer+strlen(buffer),"Default");
 			break;
 		case SMS_Coding_8bit:
 			sprintf(buffer+strlen(buffer),"8bit");
 			break;
 		}
-
-		sprintf(buffer+strlen(buffer),"',`SMSCNumber`='%s',`UDH`='",DecodeUnicodeString(sms->SMS[i].SMSC.Number));
+		sprintf(buffer+strlen(buffer),"','");
 		if (sms->SMS[i].UDH.Type != UDH_NoUDH) {
 			EncodeHexBin(buffer+strlen(buffer),sms->SMS[i].UDH.Text,sms->SMS[i].UDH.Length);
 		}
-
-		sprintf(buffer+strlen(buffer),"',`Class`='%i',`TextDecoded`='",sms->SMS[i].Class);
+		sprintf(buffer+strlen(buffer),"','%i','",sms->SMS[i].Class);
 		switch (sms->SMS[i].Coding) {
 		case SMS_Coding_Unicode:
 	    	case SMS_Coding_Default:
 			sprintf(buffer2,"%s",DecodeUnicodeString(sms->SMS[i].Text));
 			for (j=0;j<(int)strlen(buffer2);j++) {
 				sprintf(buffer3,"'");
 				z = strlen(buffer);
 				if (buffer2[j]==buffer3[0]) {				    
 				    buffer[z+2]=0;
 				    buffer[z+1]=buffer2[j];
 				    buffer[z]  ='\\';
 				} else {
 				    buffer[z+1]=0;
 				    buffer[z]  =buffer2[j];
 				}
 			}
 			break;
 		case SMS_Coding_8bit:
+
 			break;
 		}
-		sprintf(buffer+strlen(buffer),"',`Status`='%s',`DateTime`='%s' ",status,Config->DT);
-		sprintf(buffer+strlen(buffer),"WHERE `ID`='%s' AND `SequencePosition`='%i'",ID,i+1);
-		if (mysql_real_query(&Config->DB,buffer,strlen(buffer))) {
-			WriteSMSDLog("Error writing to database: %d %s\n", mysql_errno(&Config->DB), mysql_error(&Config->DB));
+		sprintf(buffer+strlen(buffer),"','");
+		if (i==0) {
+			while (true) {
+				ID++;
+				sprintf(buffer4,"SELECT ID FROM sentitems WHERE ID='%i'",ID);
+#ifdef DEBUG
+				fprintf(stdout,"%s\n",buffer4);
+#endif
+				if (mysql_real_query(&Config->DB,buffer4,strlen(buffer4))) {
+					WriteSMSDLog("Error reading from database (CreateOutbox): %s\n", mysql_error(&Config->DB));
 			return ERR_UNKNOWN;
 		}
+				if (!(Res = mysql_store_result(&Config->DB))) {
+					WriteSMSDLog("Error reading from database (CreateOutbox): %s\n", mysql_error(&Config->DB));
+					return ERR_UNKNOWN;
 	}
-	sprintf(buffer,"DELETE FROM `Outbox` WHERE `ID` = '%s'",ID);
-	if (mysql_real_query(&Config->DB,buffer,strlen(buffer))) {
-		WriteSMSDLog("Error writing to database: %d %s\n", mysql_errno(&Config->DB), mysql_error(&Config->DB));
+				if (!(Row = mysql_fetch_row(Res))) {
+					buffer4[0] = 0;
+					strcpy(buffer4,buffer);
+					sprintf(buffer4+strlen(buffer4),"%i')",ID);
+#ifdef DEBUG
+					fprintf(stdout,"%s\n",buffer4);
+#endif
+					if (mysql_real_query(&Config->DB,buffer4,strlen(buffer4))) {
+						if (mysql_errno(&Config->DB) == ER_DUP_ENTRY) {
+							WriteSMSDLog("Duplicated outgoing SMS ID\n");
+							continue;
+						}
+						WriteSMSDLog("Error writing to database (CreateOutbox): %d %s %s\n", mysql_errno(&Config->DB), mysql_error(&Config->DB),buffer4);
 		return ERR_UNKNOWN;
 	}
-	sprintf(buffer,"DELETE FROM `Outbox_MultiPart` WHERE `ID` = '%s'",ID);
-	if (mysql_real_query(&Config->DB,buffer,strlen(buffer))) {
-		WriteSMSDLog("Error writing to database: %d %s\n", mysql_errno(&Config->DB), mysql_error(&Config->DB));
+					mysql_free_result(Res);	
+					break;
+				}
+				mysql_free_result(Res);	
+			}
+		} else {
+			strcpy(buffer4,buffer);
+			sprintf(buffer4+strlen(buffer4),"%i')",ID);
+#ifdef DEBUG
+			fprintf(stdout,"%s\n",buffer4);
+#endif
+			if (mysql_real_query(&Config->DB,buffer4,strlen(buffer4))) {
+				WriteSMSDLog("Error writing to database (CreateOutbox): %d %s\n", mysql_errno(&Config->DB), mysql_error(&Config->DB));
 		return ERR_UNKNOWN;
 	}
+		}
+	}
   	return ERR_NONE;
 }
 
-/* Adds SMS to Outbox */
-static GSM_Error SMSDMySQL_CreateOutboxSMS(GSM_MultiSMSMessage *sms, GSM_SMSDConfig *Config)
+
+static GSM_Error SMSDMySQL_AddSentSMSInfo(GSM_MultiSMSMessage *sms, GSM_SMSDConfig *Config, unsigned char *ID, int Part, GSM_SMSDSendingError err, int TPMR)
 {
-	unsigned char	buffer[10000],buffer2[200],buffer3[2],buffer4[10000];
-	int 		i,j,z;
-	GSM_DateTime	time;
+	unsigned char	buffer[10000],buffer2[200],buffer3[2],buff[50];
+	int 		j,z;
 
-	for (i=0;i<sms->Number;i++) {
-		buffer[0]=0;
-		if (i==0) {
-			sprintf(buffer+strlen(buffer),"INSERT INTO `Outbox` (`MultiPart`,`DateTime");
-		} else {
-			sprintf(buffer+strlen(buffer),"INSERT INTO `Outbox_MultiPart` (`SequencePosition");
-		}
-		sprintf(buffer+strlen(buffer),"`,`Text`,`DestinationNumber`,`Coding`,`SMSCNumber`,`UDH`, \
-			`Class`,`TextDecoded`,`ID`) VALUES ('");
-		if (i==0) {
-			if (sms->Number == 1) {
-				sprintf(buffer+strlen(buffer),"false");
+	if (err == SMSD_SEND_OK) WriteSMSDLog("Transmitted %s (%s: %i) to %s", Config->SMSID, (Part == sms->Number?"total":"part"),Part,DecodeUnicodeString(sms->SMS[0].Number));
+
+	buff[0] = 0;
+	if (err == SMSD_SEND_OK) {
+		if (sms->SMS[Part-1].PDU == SMS_Status_Report) {
+			sprintf(buff,"SendingOK");
 			} else {
-				sprintf(buffer+strlen(buffer),"true");
+			sprintf(buff,"SendingOKNoReport");
 			}
-			sprintf(buffer+strlen(buffer),"',NOW()");
-		} else {
-			sprintf(buffer+strlen(buffer),"%i'",i+1);
 		}
-		sprintf(buffer+strlen(buffer),",'");
+	if (err == SMSD_SEND_SENDING_ERROR) 	sprintf(buff,"SendingError");
+	if (err == SMSD_SEND_ERROR) 		sprintf(buff,"Error");
 
-		switch (sms->SMS[i].Coding) {
+	buffer[0] = 0;
+	sprintf(buffer+strlen(buffer),"INSERT INTO `sentitems` \
+		(`ID`,`SequencePosition`,`Status`,`SendingDateTime`, `SMSCNumber`, `TPMR`, \
+		`SenderID`,`Text`,`DestinationNumber`,`Coding`,`UDH`,`Class`,`TextDecoded`,`InsertIntoDB`,`RelativeValidity`) VALUES (");
+	sprintf(buffer+strlen(buffer),"'%s','%i','%s',NOW(),'%s','%i','%s','",ID,Part,buff,DecodeUnicodeString(sms->SMS[Part-1].SMSC.Number),TPMR,Config->PhoneID);
+	switch (sms->SMS[Part-1].Coding) {
 		case SMS_Coding_Unicode:
 	    	case SMS_Coding_Default:
-			EncodeHexUnicode(buffer+strlen(buffer),sms->SMS[i].Text,UnicodeLength(sms->SMS[i].Text));
+		EncodeHexUnicode(buffer+strlen(buffer),sms->SMS[Part-1].Text,UnicodeLength(sms->SMS[Part-1].Text));
 			break;
 		case SMS_Coding_8bit:
-			EncodeHexBin(buffer+strlen(buffer),sms->SMS[i].Text,sms->SMS[i].Length);
+		EncodeHexBin(buffer+strlen(buffer),sms->SMS[Part-1].Text,sms->SMS[Part-1].Length);
 		}
-		sprintf(buffer+strlen(buffer),"','%s','",DecodeUnicodeString(sms->SMS[i].Number));
-		switch (sms->SMS[i].Coding) {
+	sprintf(buffer+strlen(buffer),"','%s','",DecodeUnicodeString(sms->SMS[Part-1].Number));
+	switch (sms->SMS[Part-1].Coding) {
 		case SMS_Coding_Unicode:
 			sprintf(buffer+strlen(buffer),"Unicode");
 			break;
 	    	case SMS_Coding_Default:
 			sprintf(buffer+strlen(buffer),"Default");
 			break;
 		case SMS_Coding_8bit:
 			sprintf(buffer+strlen(buffer),"8bit");
 			break;
 		}
-		sprintf(buffer+strlen(buffer),"','%s'",DecodeUnicodeString(sms->SMS[i].SMSC.Number));
-		if (sms->SMS[i].UDH.Type == UDH_NoUDH) {
-			sprintf(buffer+strlen(buffer),",''");
-		} else {
-			sprintf(buffer+strlen(buffer),",'");
-			EncodeHexBin(buffer+strlen(buffer),sms->SMS[i].UDH.Text,sms->SMS[i].UDH.Length);
-			sprintf(buffer+strlen(buffer),"'");
+	sprintf(buffer+strlen(buffer),"','");
+	if (sms->SMS[Part-1].UDH.Type != UDH_NoUDH) {
+		EncodeHexBin(buffer+strlen(buffer),sms->SMS[Part-1].UDH.Text,sms->SMS[Part-1].UDH.Length);
 		}
-		sprintf(buffer+strlen(buffer),",'%i','",sms->SMS[i].Class);
-		switch (sms->SMS[i].Coding) {
+	sprintf(buffer+strlen(buffer),"','%i','",sms->SMS[Part-1].Class);
+	switch (sms->SMS[Part-1].Coding) {
 		case SMS_Coding_Unicode:
 	    	case SMS_Coding_Default:
-			sprintf(buffer2,"%s",DecodeUnicodeString(sms->SMS[i].Text));
+		sprintf(buffer2,"%s",DecodeUnicodeString(sms->SMS[Part-1].Text));
 			for (j=0;j<(int)strlen(buffer2);j++) {
 				sprintf(buffer3,"'");
 				z = strlen(buffer);
 				if (buffer2[j]==buffer3[0]) {				    
 				    buffer[z+2]=0;
 				    buffer[z+1]=buffer2[j];
 				    buffer[z]  ='\\';
 				} else {
 				    buffer[z+1]=0;
 				    buffer[z]  =buffer2[j];
 				}
 			}
 			break;
 		case SMS_Coding_8bit:
-
-			break;
-		}
-		sprintf(buffer+strlen(buffer),"','");
-		if (i==0) {
-			while (true) {
-				GSM_GetCurrentDateTime(&time);
-				buffer4[0] = 0;
-				strcpy(buffer4,buffer);
-				sprintf(buffer4+strlen(buffer4),"%i')",
-					time.Hour*1000000+
-					time.Minute*10000+
-					time.Second*100+time.Day);
-				if (mysql_real_query(&Config->DB,buffer4,strlen(buffer4))) {
-					if (mysql_errno(&Config->DB) == ER_DUP_ENTRY) {
-						WriteSMSDLog("Duplicated outgoing SMS ID\n");
-						continue;
-					}
-					WriteSMSDLog("Error writing to database: %d %s\n", mysql_errno(&Config->DB), mysql_error(&Config->DB));
-					return ERR_UNKNOWN;
-				}
 				break;
 			}
+	sprintf(buffer+strlen(buffer),"','%s','",Config->DT);
+	if (sms->SMS[Part-1].SMSC.Validity.Format == SMS_Validity_RelativeFormat) {
+		sprintf(buffer+strlen(buffer),"%i')",sms->SMS[Part-1].SMSC.Validity.Relative);
 		} else {
-			strcpy(buffer4,buffer);
-			sprintf(buffer4+strlen(buffer4),"%i')",
-				time.Hour*1000000+
-				time.Minute*10000+
-				time.Second*100+time.Day);
-			if (mysql_real_query(&Config->DB,buffer4,strlen(buffer4))) {
-				WriteSMSDLog("Error writing to database: %d %s\n", mysql_errno(&Config->DB), mysql_error(&Config->DB));
-				return ERR_UNKNOWN;
-			}
+		sprintf(buffer+strlen(buffer),"-1')");
 		}
+#ifdef DEBUG
+	fprintf(stdout,"%s\n",buffer);
+#endif	
+	if (mysql_real_query(&Config->DB,buffer,strlen(buffer))) {
+		WriteSMSDLog("Error writing to database (AddSent): %d %s\n", mysql_errno(&Config->DB), mysql_error(&Config->DB));
+		return ERR_UNKNOWN;
 	}
   	return ERR_NONE;
 }
 
-static GSM_Error SMSDMySQL_AddSentSMSInfo(GSM_MultiSMSMessage *sms, GSM_SMSDConfig *Config, unsigned char *ID, int Part, bool OK)
+static GSM_Error SMSDMySQL_RefreshPhoneStatus(GSM_SMSDConfig *Config)
 {
-	unsigned char buffer[10000];
-
-	if (OK) WriteSMSDLog("Transmitted %s (%s: %i) to %s", Config->SMSID, (Part == sms->Number?"total":"part"),Part,DecodeUnicodeString(sms->SMS[0].Number));
+	unsigned char buffer[500];
 
-	buffer[0] = 0;
-	sprintf(buffer+strlen(buffer),"INSERT INTO `SentItems` \
-		(`ID`,`SequencePosition`,`Status`,`SendingDateTime`) VALUES (");
-	sprintf(buffer+strlen(buffer),"'%s','%i','Sending',NOW())",ID,Part);
+	sprintf(buffer,"UPDATE `phones` SET `TimeOut`= (NOW() + INTERVAL 10 SECOND)+0");
+	sprintf(buffer+strlen(buffer)," WHERE `IMEI` = '%s'",s.Phone.Data.IMEI);
+#ifdef DEBUG
+	fprintf(stdout,"%s\n",buffer);
+#endif
 	if (mysql_real_query(&Config->DB,buffer,strlen(buffer))) {
-		WriteSMSDLog("Error writing to database: %d %s\n", mysql_errno(&Config->DB), mysql_error(&Config->DB));
+		WriteSMSDLog("Error writing to database (SaveInboxSMS): %d %s\n", mysql_errno(&Config->DB), mysql_error(&Config->DB));
 		return ERR_UNKNOWN;
 	}
   	return ERR_NONE;
 }
 
 GSM_SMSDService SMSDMySQL = {
 	SMSDMySQL_Init,
+	SMSDMySQL_InitAfterConnect,
 	SMSDMySQL_SaveInboxSMS,
 	SMSDMySQL_FindOutboxSMS,
 	SMSDMySQL_MoveSMS,
 	SMSDMySQL_CreateOutboxSMS,
-	SMSDMySQL_AddSentSMSInfo
+	SMSDMySQL_AddSentSMSInfo,
+	SMSDMySQL_RefreshSendStatus,
+	SMSDMySQL_RefreshPhoneStatus
 };
 
 #endif
 
 /* How should editor hadle tabs in this file? Add editor commands here.
  * vim: noexpandtab sw=8 ts=8 sts=8:
  */
diff --git a/gammu/emb/gammu/smsd/smsdcore.c b/gammu/emb/gammu/smsd/smsdcore.c
index fbc55d3..cc9accc 100644
--- a/gammu/emb/gammu/smsd/smsdcore.c
+++ b/gammu/emb/gammu/smsd/smsdcore.c
@@ -1,32 +1,35 @@
-/* (c) 2002-2003 by Marcin Wiacek and Joergen Thomsen */
+/* (c) 2002-2004 by Marcin Wiacek and Joergen Thomsen */
 
 #include <string.h>
 #include <signal.h>
 #include <stdarg.h>
 #include <time.h>
 
 #include "../../common/misc/coding/coding.h"
 #include "../gammu.h"
 #include "smsdcore.h"
 #include "s_files.h"
 #ifdef HAVE_MYSQL_MYSQL_H
 #  include "s_mysql.h"
 #endif
 
 FILE 		 *smsd_log_file = NULL;
+static int	 TPMR;
 static GSM_Error SendingSMSStatus;
+
 static void SMSSendingSMSStatus (char *Device, int status, int mr)
 {
 	dbgprintf("Incoming SMS device: \"%s\" status=%d, reference=%d\n",Device, status, mr);
+	TPMR = mr;
 	if (status==0) {
 		SendingSMSStatus = ERR_NONE;
 	} else {
 		SendingSMSStatus = ERR_UNKNOWN;
 	}
 }
 
 void GSM_Terminate_SMSD(char *msg, int error, bool exitprogram, int rc)
 {
 	int ret = ERR_NONE;
 
 	if (s.opened) {
@@ -64,25 +67,25 @@ void WriteSMSDLog(char *format, ...)
 		va_end(argp);
 
 		GSM_GetCurrentDateTime(&date_time);
 
 		fprintf(smsd_log_file,"%s %4d/%02d/%02d %02d:%02d:%02d : %s\n",
 			DayOfWeek(date_time.Year, date_time.Month, date_time.Day),
 			date_time.Year, date_time.Month, date_time.Day,
 			date_time.Hour, date_time.Minute, date_time.Second,Buffer);
 		fflush(smsd_log_file);
 	}
 }
 
-void SMSD_ReadConfig(char *filename, GSM_SMSDConfig *Config, bool log)
+void SMSD_ReadConfig(char *filename, GSM_SMSDConfig *Config, bool log, char *service)
 {
 	INI_Section 		*smsdcfgfile = NULL;
 	GSM_Config 		smsdcfg;
 	unsigned char		*str;
 	static unsigned char	emptyPath[1] = "\0";
 
 	smsdcfgfile=INI_ReadFile(filename, false);
 	if (smsdcfgfile==NULL) {
 		fprintf(stderr,"Can't find file \"%s\"\n",filename);
 		exit(-1);
 	}
 
@@ -93,57 +96,57 @@ void SMSD_ReadConfig(char *filename, GSM_SMSDConfig *Config, bool log)
 			fprintf(stderr,"Can't open file \"%s\"\n",Config->logfilename);
 			exit(-1);
 		}
 		fprintf(stderr,"Log filename is \"%s\"\n",Config->logfilename);
 	}
 	if (log) WriteSMSDLog("Start GAMMU smsd");
 
 	/* Include Numbers used, because we don't want create new variable */
 	Config->IncludeNumbers=INI_FindLastSectionEntry(smsdcfgfile, "gammu", false);
 	if (Config->IncludeNumbers) {
 		GSM_ReadConfig(smsdcfgfile, &smsdcfg, 0);
 		memcpy(&s.Config,&smsdcfg,sizeof(GSM_Config));
+		error=GSM_SetDebugFile(s.Config[0].DebugFile, &di);
 	}
 
 	Config->PINCode=INI_GetValue(smsdcfgfile, "smsd", "PIN", false);
 	if (Config->PINCode == NULL) {
 		if (log) WriteSMSDLog("No PIN code in %s file",filename);
 		fprintf(stderr,"No PIN code in %s file\n",filename);
 		exit(-1);
 	}
 	if (log) WriteSMSDLog("PIN code is \"%s\"",Config->PINCode);
 
-	Config->user = INI_GetValue(smsdcfgfile, "smsd", "user", false);
-	if (Config->user == NULL) Config->user="root";
-	Config->password = INI_GetValue(smsdcfgfile, "smsd", "password", false);
-	if (Config->password == NULL) Config->password="";
-	Config->PC = INI_GetValue(smsdcfgfile, "smsd", "pc", false);
-	if (Config->PC == NULL) Config->PC="localhost";
-	Config->database = INI_GetValue(smsdcfgfile, "smsd", "database", false);
-	if (Config->database == NULL) Config->database="sms";
-
 	str = INI_GetValue(smsdcfgfile, "smsd", "commtimeout", false);
 	if (str) Config->commtimeout=atoi(str); else Config->commtimeout = 1;
 	str = INI_GetValue(smsdcfgfile, "smsd", "sendtimeout", false);
 	if (str) Config->sendtimeout=atoi(str); else Config->sendtimeout = 10;
 	str = INI_GetValue(smsdcfgfile, "smsd", "receivefrequency", false);
 	if (str) Config->receivefrequency=atoi(str); else Config->receivefrequency = 0;
-	if (log) WriteSMSDLog("commtimeout=%i, sendtimeout=%i, receivefrequency=%i", Config->commtimeout, Config->sendtimeout, Config->receivefrequency);
+	str = INI_GetValue(smsdcfgfile, "smsd", "resetfrequency", false);
+	if (str) Config->resetfrequency=atoi(str); else Config->resetfrequency = 0;
+	if (log) WriteSMSDLog("commtimeout=%i, sendtimeout=%i, receivefrequency=%i, resetfrequency=%i",
+			Config->commtimeout, Config->sendtimeout, Config->receivefrequency, Config->resetfrequency);
 
 	Config->deliveryreport = INI_GetValue(smsdcfgfile, "smsd", "deliveryreport", false);
 	if (Config->deliveryreport == NULL || (!mystrncasecmp(Config->deliveryreport, "log", 3) && !mystrncasecmp(Config->deliveryreport, "sms", 3))) {
 		Config->deliveryreport = "no";
 	}
 	if (log) WriteSMSDLog("deliveryreport = %s", Config->deliveryreport);
 
+	Config->PhoneID = INI_GetValue(smsdcfgfile, "smsd", "phoneid", false);
+	if (Config->PhoneID == NULL) Config->PhoneID = "";
+	if (log) WriteSMSDLog("phoneid = %s", Config->PhoneID);
+
+	if (!strcmp(service,"FILES")) {
 	Config->inboxpath=INI_GetValue(smsdcfgfile, "smsd", "inboxpath", false);
 	if (Config->inboxpath == NULL) Config->inboxpath = emptyPath;
 
 	Config->inboxformat=INI_GetValue(smsdcfgfile, "smsd", "inboxformat", false);
 	if (Config->inboxformat == NULL || (!mystrncasecmp(Config->inboxformat, "detail", 6) && !mystrncasecmp(Config->inboxformat, "unicode", 7))) {
 		Config->inboxformat = "standard";
 	}
 	if (log) WriteSMSDLog("Inbox is \"%s\" with format \"%s\"", Config->inboxpath, Config->inboxformat);
 
 	Config->outboxpath=INI_GetValue(smsdcfgfile, "smsd", "outboxpath", false);
 	if (Config->outboxpath == NULL) Config->outboxpath = emptyPath;
 
@@ -151,56 +154,75 @@ void SMSD_ReadConfig(char *filename, GSM_SMSDConfig *Config, bool log)
 	if (Config->transmitformat == NULL || (!mystrncasecmp(Config->transmitformat, "auto", 4) && !mystrncasecmp(Config->transmitformat, "unicode", 7))) {
 		Config->transmitformat = "7bit";
 	}
 	if (log) WriteSMSDLog("Outbox is \"%s\" with transmission format \"%s\"", Config->outboxpath, Config->transmitformat);
 
 	Config->sentsmspath=INI_GetValue(smsdcfgfile, "smsd", "sentsmspath", false);
 	if (Config->sentsmspath == NULL) Config->sentsmspath = Config->outboxpath;
 	if (log) WriteSMSDLog("Sent SMS moved to \"%s\"",Config->sentsmspath);
 
 	Config->errorsmspath=INI_GetValue(smsdcfgfile, "smsd", "errorsmspath", false);
 	if (Config->errorsmspath == NULL) Config->errorsmspath = Config->sentsmspath;
 	if (log) WriteSMSDLog("SMS with errors moved to \"%s\"",Config->errorsmspath);
+	}
+
+#ifdef HAVE_MYSQL_MYSQL_H
+	if (!strcmp(service,"MYSQL")) {
+		Config->skipsmscnumber = INI_GetValue(smsdcfgfile, "smsd", "skipsmscnumber", false);
+		if (Config->skipsmscnumber == NULL) Config->skipsmscnumber="";
+		Config->user = INI_GetValue(smsdcfgfile, "smsd", "user", false);
+		if (Config->user == NULL) Config->user="root";
+		Config->password = INI_GetValue(smsdcfgfile, "smsd", "password", false);
+		if (Config->password == NULL) Config->password="";
+		Config->PC = INI_GetValue(smsdcfgfile, "smsd", "pc", false);
+		if (Config->PC == NULL) Config->PC="localhost";
+		Config->database = INI_GetValue(smsdcfgfile, "smsd", "database", false);
+		if (Config->database == NULL) Config->database="sms";
+	}
+#endif
 
 	Config->IncludeNumbers=INI_FindLastSectionEntry(smsdcfgfile, "include_numbers", false);
 	Config->ExcludeNumbers=INI_FindLastSectionEntry(smsdcfgfile, "exclude_numbers", false);
 	if (Config->IncludeNumbers != NULL) {
 		if (log) WriteSMSDLog("Include numbers available");
 	}
 	if (Config->ExcludeNumbers != NULL) {
 		if (Config->IncludeNumbers == NULL) {
 			if (log) WriteSMSDLog("Exclude numbers available");
 		} else {
 			if (log) WriteSMSDLog("Exclude numbers available, but IGNORED");
 		}
 	}
 
 	Config->retries = 0;
 	Config->prevSMSID[0] = 0;
+	Config->SMSC.Location     = 0;
+	Config->relativevalidity  = -1;
 }
 
 bool SMSD_CheckSecurity(GSM_SMSDConfig *Config)
 {
 	GSM_SecurityCode 	SecurityCode;
 	GSM_Error		error;
 
 	/* Need PIN ? */
 	error=Phone->GetSecurityStatus(&s,&SecurityCode.Type);
 	/* Unknown error */
 	if (error != ERR_NOTSUPPORTED && error != ERR_NONE) {
 		WriteSMSDLog("Error getting security status (%i)", error);
 		return false;
 	}
 	/* No supported - do not check more */
 	if (error == ERR_NOTSUPPORTED) return true;
+
 	/* If PIN, try to enter */
 	switch (SecurityCode.Type) {
 	case SEC_Pin:
 		WriteSMSDLog("Trying to enter PIN");
 		strcpy(SecurityCode.Code,Config->PINCode);
 		error=Phone->EnterSecurityCode(&s,SecurityCode);
 		if (error == ERR_SECURITYERROR) {
 			GSM_Terminate_SMSD("ERROR: incorrect PIN", error, true, -1);
 		}
 		if (error != ERR_NONE) {
 			WriteSMSDLog("Error entering PIN (%i)", error);
 			return false;
@@ -317,191 +339,245 @@ bool SMSD_SendSMS(GSM_SMSDConfig *Config,GSM_SMSDService *Service)
 
 	error = Service->FindOutboxSMS(&sms, Config, Config->SMSID);
 
 	if (error == ERR_EMPTY || error == ERR_NOTSUPPORTED) {
 		/* No outbox sms - wait few seconds and escape */
 		for (j=0;j<Config->commtimeout && !gshutdown;j++) {
 			GSM_GetCurrentDateTime (&Date);
 			i=Date.Second;
 	 		while (i==Date.Second && !gshutdown) {
 				my_sleep(10);
 				GSM_GetCurrentDateTime(&Date);
 			}
+			Service->RefreshPhoneStatus(Config);
 		}
 		return true;
 	}
 	if (error != ERR_NONE) {
 		/* Unknown error - escape */
 		WriteSMSDLog("Error in outbox on %s", Config->SMSID);
 		for (i=0;i<sms.Number;i++) {
-			Service->AddSentSMSInfo(&sms, Config, Config->SMSID, i+1, false);
+			Service->AddSentSMSInfo(&sms, Config, Config->SMSID, i+1, SMSD_SEND_ERROR, -1);
 		}
 		Service->MoveSMS(&sms,Config, Config->SMSID, true,false);
 		return false;
 	}
+	
 	if (!gshutdown) {
 		if (strcmp(Config->prevSMSID, Config->SMSID) == 0) {
 			Config->retries++;
 			if (Config->retries > MAX_RETRIES) {
 				Config->retries = 0;
 				strcpy(Config->prevSMSID, "");
 				WriteSMSDLog("Moved to errorbox: %s", Config->SMSID);
 				for (i=0;i<sms.Number;i++) {
-					Service->AddSentSMSInfo(&sms, Config, Config->SMSID, i+1, false);
+					Service->AddSentSMSInfo(&sms, Config, Config->SMSID, i+1, SMSD_SEND_ERROR, -1);
 				}
 				Service->MoveSMS(&sms,Config, Config->SMSID, true,false);
 				return false;
 			}
 		} else {
 			Config->retries = 0;
 			strcpy(Config->prevSMSID, Config->SMSID);
 		}
 		for (i=0;i<sms.Number;i++) {
-			if (strcmp(Config->deliveryreport, "no") != 0) sms.SMS[i].PDU = SMS_Status_Report;
+			if (sms.SMS[i].SMSC.Location == 1) {
+			    	if (Config->SMSC.Location == 0) {
+					Config->SMSC.Location = 1;
+					error = Phone->GetSMSC(&s,&Config->SMSC);
+					if (error!=ERR_NONE) {
+						WriteSMSDLog("Error getting SMSC from phone");
+						return false;
+					}
+
+			    	}
+			    	memcpy(&sms.SMS[i].SMSC,&Config->SMSC,sizeof(GSM_SMSC));
+			    	sms.SMS[i].SMSC.Location = 0;
+				if (Config->relativevalidity != -1) {
+					sms.SMS[i].SMSC.Validity.Format	  = SMS_Validity_RelativeFormat;
+					sms.SMS[i].SMSC.Validity.Relative = Config->relativevalidity;
+				}
+			}
+		
+			if (Config->currdeliveryreport == 1) {
+				sms.SMS[i].PDU = SMS_Status_Report;
+			} else {
+				if ((strcmp(Config->deliveryreport, "no") != 0 && (Config->currdeliveryreport == -1))) sms.SMS[i].PDU = SMS_Status_Report;
+			}
+			
 			error=Phone->SendSMS(&s, &sms.SMS[i]);
 			if (error!=ERR_NONE) {
+				Service->AddSentSMSInfo(&sms, Config, Config->SMSID, i+1, SMSD_SEND_SENDING_ERROR, -1);
 				WriteSMSDLog("Error sending SMS %s (%i): %s", Config->SMSID, error,print_error(error,s.di.df,s.msg));
 				return false;
 			}
+			Service->RefreshPhoneStatus(Config);
 			j=0;
+			TPMR = -1;
 			SendingSMSStatus = ERR_TIMEOUT;
 			while (!gshutdown) {
 				GSM_GetCurrentDateTime (&Date);
 				z=Date.Second;
 				while (z==Date.Second) {
 					my_sleep(10);
 					GSM_GetCurrentDateTime(&Date);
 					GSM_ReadDevice(&s,true);
 					if (SendingSMSStatus != ERR_TIMEOUT) break;
 				}
+				Service->RefreshSendStatus(Config, Config->SMSID);
+				Service->RefreshPhoneStatus(Config);
 				if (SendingSMSStatus != ERR_TIMEOUT) break;
 				j++;
 				if (j>Config->sendtimeout) break;
 			}
 			if (SendingSMSStatus != ERR_NONE) {
+				Service->AddSentSMSInfo(&sms, Config, Config->SMSID, i+1, SMSD_SEND_SENDING_ERROR, TPMR);
 				WriteSMSDLog("Error getting send status of %s (%i): %s", Config->SMSID, SendingSMSStatus,print_error(SendingSMSStatus,s.di.df,s.msg));
 				return false;
 			}
-			error = Service->AddSentSMSInfo(&sms, Config, Config->SMSID, i+1, true);
+			error = Service->AddSentSMSInfo(&sms, Config, Config->SMSID, i+1, SMSD_SEND_OK, TPMR);
 			if (error!=ERR_NONE) {
 				return false;
 			}
 		}
-		while ((int)i<sms.Number-1) {
-			Service->AddSentSMSInfo(&sms, Config, Config->SMSID, i+1, false);
-			i++;
-		}
 		strcpy(Config->prevSMSID, "");
 		if (Service->MoveSMS(&sms,Config, Config->SMSID, false, true) != ERR_NONE) {
 			Service->MoveSMS(&sms,Config, Config->SMSID, true, false);
 		}
 	}
 	return true;
 }
 
 void SMSDaemon(int argc, char *argv[])
 {
 	int                     errors = 255, initerrors=0;
 	GSM_SMSDService		*Service;
 	GSM_Error		error;
- 	time_t                  time1;
+ 	time_t			lastreceive, lastreset = 0;
 	GSM_SMSDConfig		Config;
 
 	if (!strcmp(argv[2],"FILES")) {
 		Service = &SMSDFiles;
 #ifdef HAVE_MYSQL_MYSQL_H
 	} else if (!strcmp(argv[2],"MYSQL")) {
 		Service = &SMSDMySQL;
 #endif
 	} else {
 		fprintf(stderr,"Unknown service type (\"%s\")\n",argv[2]);
 		exit(-1);
 	}
 
-	SMSD_ReadConfig(argv[3], &Config, true);
+	SMSD_ReadConfig(argv[3], &Config, true, argv[2]);
 
 	error = Service->Init(&Config);
 	if (error!=ERR_NONE) {
 		GSM_Terminate_SMSD("Stop GAMMU smsd (%i)", error, true, -1);
 	}
 
 	signal(SIGINT, interrupt);
 	signal(SIGTERM, interrupt);
 	fprintf(stderr,"Press Ctrl+C to stop the program ...\n");
 
-	time1 			= time(NULL);
+	lastreceive		= time(NULL);
+	lastreset		= time(NULL);
 	SendingSMSStatus 	= ERR_UNKNOWN;
 
 	while (!gshutdown) {
 		/* There were errors in communication - try to recover */
 		if (errors > 2) {
 			if (errors != 255) {
 				WriteSMSDLog("Terminating communication (%i,%i)", error, errors);
 				error=GSM_TerminateConnection(&s);
 			}
 			if (initerrors++ > 3) my_sleep(30000);
 			WriteSMSDLog("Starting communication");
 			error=GSM_InitConnection(&s,2);
 			switch (error) {
 			case ERR_NONE:
 				s.User.SendSMSStatus 	= SMSSendingSMSStatus;
 				Phone			= s.Phone.Functions;
+				if (errors == 255) {
 				errors 			= 0;
+					s.Phone.Data.IMEI[0] = 0;
+					if (!(Phone->GetIMEI(&s))) {
+						errors++;
+					} else {
+						error = Service->InitAfterConnect(&Config);
+						if (error!=ERR_NONE) {
+							GSM_Terminate_SMSD("Stop GAMMU smsd (%i)", error, true, -1);
+						}
+						Phone->SetFastSMSSending(&s,true);
+					}
+				} else {
+					errors = 0;
+				}
+				if (initerrors > 3 || initerrors < 0) {
+					error=Phone->Reset(&s, false); /* soft reset */
+					WriteSMSDLog("Reset return code: %s (%i) ", error == ERR_NONE? "OK":"ERROR", error);
+					lastreset = time(NULL);
+					my_sleep(5000);
+				}
 				/* Marcin Wiacek: FIXME. To check */
 //				di 			= s.di;
 				break;
 			case ERR_DEVICEOPENERROR:
 				GSM_Terminate_SMSD("Can't open device (%i)", error, true, -1);
 			default:
 				WriteSMSDLog("Error at init connection (%i)", error);
 				errors = 250;
 			}
 			continue;
 		}
-		if ((difftime(time(NULL), time1) >= Config.receivefrequency) || (SendingSMSStatus != ERR_NONE)) {
-	 		time1 = time(NULL);
+		if ((difftime(time(NULL), lastreceive) >= Config.receivefrequency) || (SendingSMSStatus != ERR_NONE)) {
+	 		lastreceive = time(NULL);
 
 			if (!SMSD_CheckSecurity(&Config)) {
 				errors++;
 				initerrors++;
 				continue;
 			} else errors=0;
 
 			initerrors = 0;
 
-			if (!SMSD_CheckSMSStatus(&Config,Service)) {
+			if (!SMSD_CheckSMSStatus(&Config,Service)) { /* read all incoming SMS */
 				errors++;
 				continue;
 			} else errors=0;
+
+			if (Config.resetfrequency > 0 && difftime(time(NULL), lastreset) >= Config.resetfrequency) { /* time for preventive reset */
+				errors = 254; initerrors = -2;
+				continue;
+			}
 		}
 		if (!SMSD_SendSMS(&Config,Service)) continue;
 	}
+	Phone->SetFastSMSSending(&s,false);
 	GSM_Terminate_SMSD("Stop GAMMU smsd", 0, false, 0);
 }
 
 GSM_Error SMSDaemonSendSMS(char *service, char *filename, GSM_MultiSMSMessage *sms)
 {
 	GSM_SMSDService		*Service;
 	GSM_SMSDConfig		Config;
 
 	if (!strcmp(service,"FILES")) {
 		Service = &SMSDFiles;
 #ifdef HAVE_MYSQL_MYSQL_H
 	} else if (!strcmp(service,"MYSQL")) {
 		Service = &SMSDMySQL;
 #endif
 	} else {
 		fprintf(stderr,"Unknown service type (\"%s\")\n",service);
 		exit(-1);
 	}
 
-	SMSD_ReadConfig(filename, &Config, false);
+	SMSD_ReadConfig(filename, &Config, false, service);
 
 	error = Service->Init(&Config);
 	if (error!=ERR_NONE) return ERR_UNKNOWN;
 	
 	return Service->CreateOutboxSMS(sms,&Config);
 }
 
 /* How should editor hadle tabs in this file? Add editor commands here.
  * vim: noexpandtab sw=8 ts=8 sts=8:
  */
diff --git a/gammu/emb/gammu/smsd/smsdcore.h b/gammu/emb/gammu/smsd/smsdcore.h
index 23e402e..17ffe58 100644
--- a/gammu/emb/gammu/smsd/smsdcore.h
+++ b/gammu/emb/gammu/smsd/smsdcore.h
@@ -1,61 +1,78 @@
-/* (c) 2002-2003 by Marcin Wiacek and Joergen Thomsen */
+/* (c) 2002-2004 by Marcin Wiacek and Joergen Thomsen */
 
 #include "../../cfg/config.h"
-#undef HAVE_MYSQL_MYSQL_H
+
 #ifdef HAVE_MYSQL_MYSQL_H
 #ifdef WIN32
 #  include <mysql.h>
 #  include <mysqld_error.h>
 #else
 #  include <mysql/mysql.h>
 #  include <mysql/mysqld_error.h>
 #endif
 #endif
 
 #include "../../common/service/sms/gsmsms.h"
 #include "../../common/service/sms/gsmmulti.h"
 
 #define MAX_RETRIES 1
 
 void      SMSDaemon		(int argc, char *argv[]);
 GSM_Error SMSDaemonSendSMS	(char *service, char *filename, GSM_MultiSMSMessage *sms);
 
 typedef struct {
 	/* general options */
 	INI_Entry       *IncludeNumbers, *ExcludeNumbers;
 	unsigned int    commtimeout, 	 sendtimeout,   receivefrequency;
+	unsigned int	resetfrequency;
 	unsigned char   *deliveryreport, *logfilename,  *PINCode;
+	unsigned char	*PhoneID;
 
 	/* options for FILES */
 	unsigned char   *inboxpath, 	 *outboxpath, 	*sentsmspath;
 	unsigned char   *errorsmspath, 	 *inboxformat,  *transmitformat;
 
 	/* options for MYSQL */
 	unsigned char	*database,	 *user,		*password;
-	unsigned char	*PC;
+	unsigned char	*PC,		 *skipsmscnumber;
 
 	/* private variables required for work */
-	unsigned int 	retries;
+	int		relativevalidity;
+	unsigned int 	retries,	 currdeliveryreport;
 	unsigned char 	SMSID[200],	 prevSMSID[200];
+	GSM_SMSC	SMSC;
 #ifdef HAVE_MYSQL_MYSQL_H
 	MYSQL 		DB;		 char 		DT[20];
 #endif
 } GSM_SMSDConfig;
 
+typedef enum {
+	SMSD_SEND_OK = 1,
+	SMSD_SEND_SENDING_ERROR,
+	SMSD_SEND_DELIVERY_PENDING,
+	SMSD_SEND_DELIVERY_FAILED,
+	SMSD_SEND_DELIVERY_OK,
+	SMSD_SEND_DELIVERY_UNKNOWN,
+	SMSD_SEND_ERROR
+} GSM_SMSDSendingError;
+
 typedef struct {
 	GSM_Error	(*Init) 	   (GSM_SMSDConfig *Config);
+	GSM_Error	(*InitAfterConnect)   (GSM_SMSDConfig *Config);
 	GSM_Error	(*SaveInboxSMS)    (GSM_MultiSMSMessage  sms, GSM_SMSDConfig *Config);
 	GSM_Error	(*FindOutboxSMS)   (GSM_MultiSMSMessage *sms, GSM_SMSDConfig *Config, unsigned char *ID);
 	GSM_Error	(*MoveSMS)  	   (GSM_MultiSMSMessage *sms, GSM_SMSDConfig *Config, unsigned char *ID, bool alwaysDelete, bool sent);
 	GSM_Error	(*CreateOutboxSMS) (GSM_MultiSMSMessage *sms, GSM_SMSDConfig *Config);
-	GSM_Error	(*AddSentSMSInfo)  (GSM_MultiSMSMessage *sms, GSM_SMSDConfig *Config, unsigned char *ID, int Part, bool OK);
+	GSM_Error	(*AddSentSMSInfo)     (GSM_MultiSMSMessage *sms, GSM_SMSDConfig *Config, unsigned char *ID, int Part, GSM_SMSDSendingError err, int TPMR);
+	GSM_Error	(*RefreshSendStatus)  (GSM_SMSDConfig *Config, unsigned char *ID);
+	GSM_Error	(*RefreshPhoneStatus) (GSM_SMSDConfig *Config);
 } GSM_SMSDService;
 
 #ifdef __GNUC__
 __attribute__((format(printf, 1, 2)))
 #endif
 void WriteSMSDLog(char *format, ...);
 
 /* How should editor hadle tabs in this file? Add editor commands here.
  * vim: noexpandtab sw=8 ts=8 sts=8:
  */