2 files changed, 13 insertions, 3 deletions

diff --git a/gammu/emb/common/service/gsmcal.c b/gammu/emb/common/service/gsmcal.c
index 0ea8e06..0375fee 100644
--- a/gammu/emb/common/service/gsmcal.c
+++ b/gammu/emb/common/service/gsmcal.c
@@ -69,4 +69,7 @@ void GSM_CalendarFindDefaultTextTimeAlarmPhoneRecurrance(GSM_CalendarEntry *entr
                         break;
                 case CAL_TEXT:
+                    *Text = i;
+                        break;
+                case CAL_DESCRIPTION:
                         if (*Text == -1) *Text = i;
                         break;
@@ -198,7 +201,7 @@ GSM_Error GSM_EncodeVCALENDAR(char *Buffer, int *Length, GSM_CalendarEntry *note
                                 CopyUnicodeString(buffer+UnicodeLength(buffer)*2,note->Entries[Text].Text);
                         }
-                        SaveVCALText(Buffer, Length, buffer, "DESCRIPTION");
+                        SaveVCALText(Buffer, Length, buffer, "SUMMARY");
                 } else {
-                        SaveVCALText(Buffer, Length, note->Entries[Text].Text, "DESCRIPTION");
+                        SaveVCALText(Buffer, Length, note->Entries[Text].Text, "SUMMARY");
                 }
         } else if (Version == SonyEricsson_VCalendar) {
@@ -417,9 +420,15 @@ GSM_Error GSM_DecodeVCALENDAR_VTODO(unsigned char *Buffer, int *Pos, GSM_Calenda
                                 Calendar->EntriesNum++;
                         }
-                        if ((ReadVCALText(Line, "SUMMARY", Buff)) || (ReadVCALText(Line, "DESCRIPTION", Buff))) {
+            // LR 
+                        if ((ReadVCALText(Line, "SUMMARY", Buff)) ) {
                                 Calendar->Entries[Calendar->EntriesNum].EntryType = CAL_TEXT;
                                 CopyUnicodeString(Calendar->Entries[Calendar->EntriesNum].Text,Buff);
                                 Calendar->EntriesNum++;
                         }
+                        if (ReadVCALText(Line, "DESCRIPTION", Buff)) {
+                                Calendar->Entries[Calendar->EntriesNum].EntryType = CAL_DESCRIPTION;
+                                CopyUnicodeString(Calendar->Entries[Calendar->EntriesNum].Text,Buff);
+                                Calendar->EntriesNum++;
+                        }
                         if (ReadVCALText(Line, "LOCATION", Buff)) {
                                 Calendar->Entries[Calendar->EntriesNum].EntryType = CAL_LOCATION;
diff --git a/gammu/emb/common/service/gsmcal.h b/gammu/emb/common/service/gsmcal.h
index 0a41b7b..c69fdbe 100644
--- a/gammu/emb/common/service/gsmcal.h
+++ b/gammu/emb/common/service/gsmcal.h
@@ -158,4 +158,5 @@ typedef enum {
          */
         CAL_TEXT,
+        CAL_DESCRIPTION, // LR added
         /**
          * Location.