diff -Naur pilot-link.0.9.5/include/pi-mail.h pilot-link.0.9.5-mt/include/pi-mail.h
--- pilot-link.0.9.5/include/pi-mail.h	Mon May 14 07:48:34 2001
+++ pilot-link.0.9.5-mt/include/pi-mail.h	Sat Jan 11 20:00:12 2003
@@ -31,7 +31,7 @@
 
 	struct MailAppInfo {
 		struct CategoryAppInfo category;
-		int dirty;			/* boolean */
+		int dbdirty;			/* boolean */
 		int sortOrder;
 		unsigned long unsentMessage;	/* UniqueID of unsent message */
 
diff -Naur pilot-link.0.9.5/include/pi-todo.h pilot-link.0.9.5-mt/include/pi-todo.h
--- pilot-link.0.9.5/include/pi-todo.h	Mon May 14 07:48:34 2001
+++ pilot-link.0.9.5-mt/include/pi-todo.h	Sat Jan 11 20:02:01 2003
@@ -19,7 +19,7 @@
 
 	struct ToDoAppInfo {
 		struct CategoryAppInfo category;
-		int dirty;
+		int dbdirty;
 		int sortByPriority;
 	};
 
diff -Naur pilot-link.0.9.5/libsock/mail.c pilot-link.0.9.5-mt/libsock/mail.c
--- pilot-link.0.9.5/libsock/mail.c	Wed Jun  6 09:16:56 2001
+++ pilot-link.0.9.5-mt/libsock/mail.c	Sat Jan 11 20:01:20 2003
@@ -382,7 +382,7 @@
 	len -= i;
 	if (len < 11)
 		return 0;
-	ai->dirty = get_short(record);
+	ai->dbdirty = get_short(record);
 	record += 2;
 	ai->sortOrder = get_byte(record);
 	record += 2;
@@ -422,7 +422,7 @@
 	len -= i;
 	if (len < 8)
 		return 0;
-	set_short(record, ai->dirty);
+	set_short(record, ai->dbdirty);
 	record += 2;
 	set_short(record, 0);	/* gapfill */
 	set_byte(record, ai->sortOrder);
diff -Naur pilot-link.0.9.5/libsock/todo.c pilot-link.0.9.5-mt/libsock/todo.c
--- pilot-link.0.9.5/libsock/todo.c	Wed Jun  6 09:16:57 2001
+++ pilot-link.0.9.5-mt/libsock/todo.c	Sat Jan 11 20:02:42 2003
@@ -207,7 +207,7 @@
 	len -= i;
 	if (len < 4)
 		return 0;
-	ai->dirty = get_short(record);
+	ai->dbdirty = get_short(record);
 	record += 2;
 	ai->sortByPriority = get_byte(record);
 	record += 2;
@@ -240,7 +240,7 @@
 	len -= i;
 	if (len < 4)
 		return 0;
-	set_short(record, ai->dirty);
+	set_short(record, ai->dbdirty);
 	set_byte(record + 2, ai->sortByPriority);
 	set_byte(record + 3, 0);	/* gapfill */
 	record += 4;
diff -Naur pilot-link.0.9.5/tools/Perl5/Pilot.xs pilot-link.0.9.5-mt/tools/Perl5/Pilot.xs
--- pilot-link.0.9.5/tools/Perl5/Pilot.xs	Wed Jun  6 09:16:58 2001
+++ pilot-link.0.9.5-mt/tools/Perl5/Pilot.xs	Sat Jan 11 20:23:31 2003
@@ -1226,7 +1226,7 @@
 
 	    doUnpackCategory(ret, &a.category);
 
-	    hv_store(ret, "dirty", 5, newSViv(a.dirty), 0);
+	    hv_store(ret, "dirty", 5, newSViv(a.dbdirty), 0);
 
 	    hv_store(ret, "sortByPriority", 14, newSViv(a.sortByPriority), 0);
 	}
@@ -1255,7 +1255,7 @@
 
 	doPackCategory(h, &a.category);
 
-    a.dirty = (s = hv_fetch(h, "dirty", 5, 0)) ? SvIV(*s) : 0;
+    a.dbdirty = (s = hv_fetch(h, "dirty", 5, 0)) ? SvIV(*s) : 0;
     a.sortByPriority = (s = hv_fetch(h, "sortByPriority", 14, 0)) ? SvIV(*s) : 0;
 
     len = pack_ToDoAppInfo(&a, (CPTR)mybuf, 0xffff);
@@ -2049,7 +2049,7 @@
 
 	    hv_store(ret, "sortOrder", 9, newSVlist(a.sortOrder, MailSortTypeNames), 0);
 
-	    hv_store(ret, "dirty", 5, newSViv(a.dirty), 0);
+	    hv_store(ret, "dirty", 5, newSViv(a.dbdirty), 0);
 	    hv_store(ret, "unsentMessage", 13, newSViv(a.unsentMessage), 0);
 	}
     }
@@ -2080,7 +2080,7 @@
 	else
 		a.sortOrder = 0;
 
-	a.dirty = (s=hv_fetch(h,"dirty",5,0)) ? SvIV(*s) : 0;
+	a.dbdirty = (s=hv_fetch(h,"dirty",5,0)) ? SvIV(*s) : 0;
 	a.unsentMessage = (s=hv_fetch(h,"unsentMessage",13,0)) ? SvIV(*s) : 0;
 
     len = pack_MailAppInfo(&a, (CPTR)mybuf, 0xffff);