updated to latest gammu version

16 files changed, 497 insertions, 63 deletions

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
@@ -8,54 +8,58 @@
 #include "../gsmpbk.h"
 #include "../gsmcal.h"
 #include "../gsmlogo.h"
 #include "../gsmring.h"
 #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
 
 typedef struct {
 	GSM_SMSMessage		*SMS[GSM_BACKUP_MAX_SMS];
 } GSM_SMS_Backup;
 
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
@@ -138,79 +138,80 @@ static void ReadLinkedBackupText(INI_Section *file_info, char *section, char *my
 
 static void SaveBackupText(FILE *file, char *myname, char *myvalue, bool UseUnicode)
 {
 	unsigned char buffer[10000], buffer2[10000];
 
 	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;
+	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)
 {
 	unsigned char 	buffer[100];
 	int		Length = 3;
 
 	sprintf(buffer, " = ");
@@ -405,50 +406,61 @@ static void SavePbkEntry(FILE *file, GSM_MemoryEntry *Pbk, bool UseUnicode)
 				}
 				i = 0;
 				while (Pbk->Entries[j].SMSList[i]!=0) {
 					sprintf(buffer,"Entry%02iSMSList%02i = %i%c%c",j,i,Pbk->Entries[j].SMSList[i],13,10);
 					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;
 		case GSM_CAL_BIRTHDAY 	: sprintf(buffer,"Birthday%c%c", 		13,10); break;
 		case GSM_CAL_TRAVEL  	: sprintf(buffer,"Travel%c%c", 			13,10); break;
 		case GSM_CAL_VACATION 	: sprintf(buffer,"Vacation%c%c", 		13,10); break;
-		case GSM_CAL_MEMO	 	: sprintf(buffer,"Memo%c%c", 			13,10); break;
+		case GSM_CAL_MEMO	: sprintf(buffer,"Memo%c%c", 			13,10); break;
 		case GSM_CAL_ALARM    	: sprintf(buffer,"Alarm%c%c", 			13,10); break;
-		case GSM_CAL_DAILY_ALARM 	: sprintf(buffer,"DailyAlarm%c%c", 		13,10); break;
+		case GSM_CAL_DAILY_ALARM: sprintf(buffer,"DailyAlarm%c%c", 		13,10); break;
 		case GSM_CAL_T_ATHL   	: sprintf(buffer,"Training/Athletism%c%c", 	13,10); break;
        		case GSM_CAL_T_BALL   	: sprintf(buffer,"Training/BallGames%c%c", 	13,10); break;
                 case GSM_CAL_T_CYCL   	: sprintf(buffer,"Training/Cycling%c%c", 	13,10); break;
                 case GSM_CAL_T_BUDO   	: sprintf(buffer,"Training/Budo%c%c", 		13,10); break;
                 case GSM_CAL_T_DANC   	: sprintf(buffer,"Training/Dance%c%c", 		13,10); break;
                 case GSM_CAL_T_EXTR   	: sprintf(buffer,"Training/ExtremeSports%c%c", 	13,10); break;
                 case GSM_CAL_T_FOOT   	: sprintf(buffer,"Training/Football%c%c", 	13,10); break;
                 case GSM_CAL_T_GOLF   	: sprintf(buffer,"Training/Golf%c%c", 		13,10); break;
                 case GSM_CAL_T_GYM    	: sprintf(buffer,"Training/Gym%c%c", 		13,10); break;
                 case GSM_CAL_T_HORS   	: sprintf(buffer,"Training/HorseRaces%c%c", 	13,10); break;
                 case GSM_CAL_T_HOCK   	: sprintf(buffer,"Training/Hockey%c%c", 	13,10); break;
                 case GSM_CAL_T_RACE   	: sprintf(buffer,"Training/Races%c%c", 		13,10); break;
                 case GSM_CAL_T_RUGB   	: sprintf(buffer,"Training/Rugby%c%c", 		13,10); break;
                 case GSM_CAL_T_SAIL   	: sprintf(buffer,"Training/Sailing%c%c", 	13,10); break;
                 case GSM_CAL_T_STRE   	: sprintf(buffer,"Training/StreetGames%c%c",	13,10); break;
                 case GSM_CAL_T_SWIM   	: sprintf(buffer,"Training/Swimming%c%c", 	13,10); break;
@@ -644,32 +656,74 @@ static void SaveWAPSettingsEntry(FILE *file, GSM_MultiWAPSettings *settings, boo
 				sprintf(buffer,"Bearer%02i = USSD%c%c",i,13,10);
 				SaveBackupText(file, "", buffer, UseUnicode);
 				sprintf(buffer,"ServiceCode%02i",i);
 				SaveBackupText(file, buffer, settings->Settings[i].Code, UseUnicode);
 				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] = ' ';
 			if (GSM_IsPointBitmap(bitmap,x,y)) buffer[x]='#';
 		}
 		buffer[bitmap->BitmapWidth] = 0;
 		sprintf(buffer2,"Bitmap%02i = \"%s\"%c%c",y,buffer,13,10);
@@ -751,49 +805,50 @@ static void SaveSMSCEntry(FILE *file, GSM_SMSC *SMSC, bool UseUnicode)
 	switch (SMSC->Validity.Relative) {
 		case SMS_VALID_1_Hour	: sprintf(buffer, "1hour"	); break;
 		case SMS_VALID_6_Hours 	: sprintf(buffer, "6hours"	); break;
 		case SMS_VALID_1_Day	: sprintf(buffer, "24hours"	); break;
 		case SMS_VALID_3_Days	: sprintf(buffer, "72hours"	); break;
 		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;
+	unsigned char buffer[45000];
 
 	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);
 	SaveBackupText(file, "", buffer, UseUnicode);
 	sprintf(buffer,"Network = \"%s\"%c%c", bitmap->NetworkCode,13,10);
 	SaveBackupText(file, "", buffer, UseUnicode);
 	SaveBitmapEntry(file, bitmap, UseUnicode);
@@ -1062,32 +1117,39 @@ GSM_Error SaveBackup(char *FileName, GSM_Backup *backup, bool UseUnicode)
 	}
 	i=0;
 	while (backup->SIMPhonebook[i]!=NULL) {
 		sprintf(buffer,"[SIMPBK%03i]%c%c",i+1,13,10);
 		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++;
 	}
 	i=0;
 	while (backup->WAPBookmark[i]!=NULL) {
 		sprintf(buffer,"[WAPBookmark%03i]%c%c",i+1,13,10);
@@ -1097,32 +1159,46 @@ GSM_Error SaveBackup(char *FileName, GSM_Backup *backup, bool UseUnicode)
 	}
 	i=0;
 	while (backup->WAPSettings[i]!=NULL) {
 		sprintf(buffer,"[WAPSettings%03i]%c%c",i+1,13,10);
 		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++;
 	}
 	i=0;
 	while (backup->Profiles[i]!=NULL) {
 		sprintf(buffer,"[Profile%03i]%c%c",i+1,13,10);
@@ -2643,33 +2719,158 @@ GSM_Error LoadBackup(char *FileName, GSM_Backup *backup, bool UseUnicode)
 			if (readvalue==NULL) break;
 			if (num < GSM_BACKUP_MAX_NOTE) {
 				backup->Note[num] = malloc(sizeof(GSM_NoteEntry));
 			        if (backup->Note[num] == NULL) return ERR_MOREMEMORY;
 				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;
 	SMS->SMSC.Location = 0;
 	sprintf(buffer,"SMSC");
 	ReadBackupText(file_info, section, buffer, SMS->SMSC.Number, false);
 	sprintf(buffer,"ReplySMSC");
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
@@ -60,32 +60,44 @@ void GSM_FreeBackup(GSM_Backup *backup)
 		backup->WAPBookmark[i] = NULL;
 		i++;
 	}
 	i=0;
 	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;
 	while (backup->Profiles[i]!=NULL) {
 		free(backup->Profiles[i]);
 		backup->Profiles[i] = NULL;
 		i++;
@@ -107,121 +119,125 @@ void GSM_FreeBackup(GSM_Backup *backup)
 	i=0;
 	while (backup->GPRSPoint[i]!=NULL) {
 		free(backup->GPRSPoint[i]);
 		backup->GPRSPoint[i] = NULL;
 		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;
 	backup->DateTimeAvailable   = false;
 	backup->MD5Original	[0] = 0;
 	backup->MD5Calculated	[0] = 0;
 }
 
 void GSM_GetBackupFormatFeatures(char *FileName, GSM_Backup_Info *info)
 {
 	info->UseUnicode	= false;
 	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;
 		info->StartupLogo 	= true;
 	} else if (strstr(FileName,".vcs")) {
 		info->ToDo		= true;
 		info->Calendar 		= true;
@@ -233,32 +249,34 @@ void GSM_GetBackupFormatFeatures(char *FileName, GSM_Backup_Info *info)
 	} else if (strstr(FileName,".ldif")) {
 		info->PhonePhonebook	= true;
 	} else {
 		info->UseUnicode	= true;
 		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)
 {
 	GSM_GetBackupFormatFeatures(FileName, info);
 
 	if (info->PhonePhonebook && backup->PhonePhonebook[0] == NULL) info->PhonePhonebook = false;
 	if (info->SIMPhonebook   && backup->SIMPhonebook[0]   == NULL) info->SIMPhonebook   = false;
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
@@ -16,32 +16,34 @@ void GSM_FreeBackup  (GSM_Backup *backup);
 typedef struct {
 	bool UseUnicode;
 
 	bool IMEI;
 	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
 #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/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
@@ -392,33 +392,33 @@ typedef enum {
 GSM_Error GSM_EncodeVTODO(char *Buffer, int *Length, GSM_ToDoEntry *note, bool header, GSM_VToDoVersion Version);
 
 /**
  * Status of to do entries.
  */
 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.
 	 */
 	int	     	Location;
 	/**
 	 * Date and time of alarm.
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
@@ -233,79 +233,157 @@ void NOKIA_EncodeWAPMMSSettingsSMSText(unsigned char *Buffer, int *Length, GSM_W
 			Buffer[(*Length)++] = buffer[i];//Text
 		}
 		Buffer[(*Length)++] = 0x00; 		//END Inline string
 		Buffer[(*Length)++] = 0x01; 		//END PARMeter
 
 		/* 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 {
-				/* TITLE */
-				AddWAPSMSParameterText(Buffer, Length, 0x15, bookmark->Title, UnicodeLength(bookmark->Title)*2+1);
-				/* URL */
-				AddWAPSMSParameterText(Buffer, Length, 0x17, bookmark->Address, UnicodeLength(bookmark->Address)*2+1);
+
+			/* 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 */
+			EncodeUTF8(buffer, bookmark->Title);
+			AddWAPSMSParameterText(Buffer, Length, 0x15, buffer, strlen(buffer));
+			/* URL */
+			EncodeUTF8(buffer, bookmark->Address);
+			AddWAPSMSParameterText(Buffer, Length, 0x17, buffer, strlen(buffer));
+
+		Buffer[(*Length)++] = 0x01;		//END (CHARACTERISTIC)
+	Buffer[(*Length)++] = 0x01;			//END (CHARACTERISTIC-LIST)
+}
+
+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)++] = 0x01;		//END PARMeter
-	Buffer[(*Length)++] = 0x01;			//END PARMeter
+			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;
 	Buffer[(*Length)++] = 0x00;
 
 	strcpy(Buffer+(*Length),"\x8D\x90\x89");
 	(*Length)=(*Length)+3;
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
@@ -75,32 +75,34 @@ typedef struct {
 	int			Location;
 } GSM_WAPBookmark;
 
 void 		NOKIA_EncodeWAPBookmarkSMSText	(unsigned char *Buffer, int *Length, GSM_WAPBookmark *bookmark);
 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;
 
 	GSM_File		File;
 	unsigned char		*Buffer;
 } EncodeMultiPartMMSEntry;
 
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,20 +1,21 @@
 /* (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;
 		case GSM_EMSMediumPicture	: *width=16; *height=16; break;
 		case GSM_EMSBigPicture		: *width=32; *height=32; break;
 		case GSM_NokiaOperatorLogo	:
 		case GSM_NokiaCallerLogo	: *width=72; *height=14; break;
@@ -148,32 +149,33 @@ void PHONE_DecodeBitmap(GSM_Phone_Bitmap_Types Type, char *buffer, GSM_Bitmap *B
 		case GSM_EMSMediumPicture	:
 		case GSM_EMSBigPicture		: Bitmap->Type=GSM_PictureImage;	break;
 	}
 
 	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)
 {
 	memset(buffer,0,PHONE_GetBitmapSize(Type,width,height));
 }
 
@@ -613,43 +615,43 @@ static GSM_Error savewbmp(FILE *file, GSM_MultiBitmap *bitmap)
 	fwrite(buffer,1,4,file);
 
 	PrivSaveNLMWBMP(file, &bitmap->Bitmap[0]);
 
 	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;
 	unsigned char 	buff[34];
 	int		w,h,pos,y,x,i,buffpos=0;
 #ifdef DEBUG
 	int		sizeimage=0;
@@ -942,58 +944,91 @@ static GSM_Error loadnsl(FILE *file, GSM_MultiBitmap *bitmap)
 static GSM_Error loadwbmp(FILE *file, GSM_MultiBitmap *bitmap)
 {
 	unsigned char buffer[10000];
 
 	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;
 	Buffer[(*Length)++] = 0x01;
 	PHONE_EncodeBitmap(Type, Buffer + (*Length), Bitmap);
 	(*Length) = (*Length) + PHONE_GetBitmapSize(Type,0,0);
 }
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,23 +1,37 @@
 /* (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
 	 */
 	GSM_StartupLogo,
 	/**
 	 * ID of static file in filesystem displayed instead of operator name
 	 */
@@ -32,33 +46,37 @@ typedef enum {
 	GSM_ColourWallPaper_ID,
 	/**
 	 * Mono bitmap assigned to caller group
 	 */
 	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
 	 */
 	GSM_Bitmap_Types 	Type;
 	/**
 	 * For caller group logos: number of group
 	 * For startup logos: number of animated bitmap
@@ -102,32 +120,40 @@ typedef struct {
 	/**
 	 * For mono bitmaps: width specified in pixels
 	 */
 	unsigned char 		BitmapWidth;
 	/**
 	 * 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;
 	/**
 	 * All bitmaps
 	 */
 	GSM_Bitmap		Bitmap[MAX_MULTI_BITMAP];
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
@@ -279,33 +279,38 @@ typedef struct {
 } GSM_FileSystemStatus;
 
 /* ----------------------------- GPRS access points ----------------------- */
 
 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);
 
 void SaveVCALText(char *Buffer, int *Length, char *Text, char *Start);
 bool ReadVCALText(char *Buffer, char *Start, char *Value);
 
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,25 +1,28 @@
 /* (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)
 {
 	double freq=0;
 
 	/* Values according to the software from http://iki.fi/too/sw/xring/
 	 * generated with:
@@ -143,32 +146,38 @@ static GSM_Error savebin(FILE *file, GSM_Ringtone *ringtone)
 	fwrite(&nullchar,1,1,file);
 	fwrite(&nullchar,1,1,file);
 	fprintf(file,"\x0C\x01\x2C");
 	fprintf(file,"%s",DecodeUnicodeString(ringtone->Name));
 	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];
 	int			i,j,k=0;
 
   	/* Saves ringtone name */
 	fprintf(file,"%s:",DecodeUnicodeString(ringtone->Name));
@@ -472,32 +481,35 @@ GSM_Error GSM_SaveRingtoneFile(char *FileName, GSM_Ringtone *ringtone)
 		} else if (strstr(FileName,".imy")) {
 			saveimelody(file,ringtone);
 		} else if (strstr(FileName,".ime")) {
 			saveimelody(file,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;
 	int			DefNoteTempo	= 63, i=0;
 
 	unsigned char		buffer[2000],Name[100];
 	GSM_RingNote		*Note;
@@ -756,32 +768,52 @@ static GSM_Error loadbin(FILE *file, GSM_Ringtone *ringtone)
 	dbgprintf("Length %i name \"%s\"\n",ringtone->NokiaBinary.Length,DecodeUnicodeString(ringtone->Name));
 	return ERR_NONE;
 }
 
 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 {
 		/* DCT3, normal subformat, 32xx/33xx/51xx/5210/5510/61xx/8xxx */      
 		EncodeUnicode(ringtone->Name,buffer+17,buffer[16]);
 		ringtone->NokiaBinary.Length = ringtone->NokiaBinary.Length - (19+UnicodeLength(ringtone->Name));
 		memcpy(ringtone->NokiaBinary.Frame,buffer+19+UnicodeLength(ringtone->Name),ringtone->NokiaBinary.Length);
@@ -803,58 +835,67 @@ GSM_Error GSM_ReadRingtoneFile(char *FileName, GSM_Ringtone *ringtone)
 	/* Read the header of the file. */
 	fread(buffer, 1, 4, file);
 	if (ringtone->Format == 0x00) {
 		ringtone->Format = RING_NOTETONE;
 		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;
 		break;
 	case RING_NOKIABINARY:
 		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,
 	800,	900
 };
 
 int GSM_RTTLGetTempo(int Beats)
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
@@ -107,47 +107,49 @@ typedef enum {
 	RING_DisableLED,
 	RING_Repeat
 } GSM_RingCommandType;
 
 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;
 	/**
 	 * Ringtone format
 	 */
 	GSM_RingtoneFormat			Format;
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
@@ -474,32 +474,37 @@ GSM_Error GSM_EncodeMultiPartSMS(GSM_MultiPartSMSInfo		*Info,
 			j += PHONE_GetBitmapSize(GSM_AlcatelBMMIPicture,Info->Entries[0].Bitmap->Bitmap[i].BitmapWidth,Info->Entries[0].Bitmap->Bitmap[i].BitmapHeight)+2;
 		}
 
 		/* Bitmaps */
 		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);
 		}
 		break;
 	case SMS_NokiaOperatorLogoLong:
 		if (Info->Entries[0].Bitmap->Bitmap[0].BitmapWidth > 72 || Info->Entries[0].Bitmap->Bitmap[0].BitmapHeight > 14) {
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,21 +1,25 @@
 /* (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 */
 
 #define SM30_ISOTEXT      0 /* ISO 8859-1 text */
 #define SM30_UNICODETEXT  1
 #define SM30_OTA	  2
 #define SM30_RINGTONE     3
@@ -159,50 +163,51 @@ typedef enum {
 	/**
 	 * IMelody 1.0
 	 */
 	SMS_EMSSound10,
 	/**
 	 * 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 {
 	EncodeMultiPartSMSID    ID;
 
 	int		     	Number;
 	GSM_Ringtone	    	*Ringtone;
@@ -251,21 +256,25 @@ bool GSM_DecodeMultiPartSMS (GSM_MultiPartSMSInfo *Info, GSM_MultiSMSMessage *SM
 
 /**
  * Clears @ref GSM_MultiPartSMSInfo to default values.
  */
 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,18 +1,21 @@
 /* (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"
 #include "../gsmnet.h"
 #include "gsmsms.h"
 
 /* User data headers */
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,18 +1,21 @@
 /* (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 ------------------------- */
 
 #define GSM_MAX_UDH_LENGTH		140
 #define GSM_MAX_SMS_LENGTH		160
 #define GSM_MAX_8BIT_SMS_LENGTH	 	140