diff --git a/ActiveSync/SOGoActiveSyncDispatcher.m b/ActiveSync/SOGoActiveSyncDispatcher.m
index a4b18aeb1..b9612c229 100644
--- a/ActiveSync/SOGoActiveSyncDispatcher.m
+++ b/ActiveSync/SOGoActiveSyncDispatcher.m
@@ -2048,9 +2048,8 @@ void handle_eas_terminate(int signum)
dstUidCache = [dstFolderMetadata objectForKey: @"UidCache"];
dstSyncCache = [dstFolderMetadata objectForKey: @"SyncCache"];
- if (srcUidCache)
+ if (srcUidCache && (srcMessageId = [[srcUidCache allKeysForObject: origSrcMessageId] objectAtIndex: 0]))
{
- srcMessageId = [[srcUidCache allKeysForObject: origSrcMessageId] objectAtIndex: 0];
if (debugOn)
[self logWithFormat: @"EAS - Found serverId: %@ for easId: %@", srcMessageId, origSrcMessageId];
}
diff --git a/ActiveSync/iCalRecurrenceRule+ActiveSync.m b/ActiveSync/iCalRecurrenceRule+ActiveSync.m
index 225bbd90a..621d6f810 100644
--- a/ActiveSync/iCalRecurrenceRule+ActiveSync.m
+++ b/ActiveSync/iCalRecurrenceRule+ActiveSync.m
@@ -176,7 +176,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
}
}
else
- type = 5;
+ {
+ type = 5;
+ [s appendFormat: @"%d",
+ (int)[[[self parent] startDate] dayOfMonth]];
+ [s appendFormat: @"%d",
+ (int)[[[self parent] startDate] monthOfYear]];
+
+ }
}
[s appendFormat: @"%d", type];