diff --git a/scripts/ScribeScripts.h b/scripts/ScribeScripts.h
--- a/scripts/ScribeScripts.h
+++ b/scripts/ScribeScripts.h
@@ -1,28 +1,53 @@
 // Various Scribe related magic values
 
 // Type types
 #define ScribeItemBase			0xAAFF0000
 #define ScribeItemMail			(ScribeItemBase + 1)
 #define ScribeItemContact		(ScribeItemBase + 2)
 #define ScribeItemMailbox		(ScribeItemBase + 4)
 #define ScribeItemAttachment	(ScribeItemBase + 5)
 #define ScribeItemAny			(ScribeItemBase + 6)
 #define ScribeItemFilter		(ScribeItemBase + 7)
 #define ScribeItemFolder		(ScribeItemBase + 8)
 #define ScribeItemCondition		(ScribeItemBase + 9)
 #define ScribeItemAction		(ScribeItemBase + 10)
 #define ScribeItemCalendar		(ScribeItemBase + 11)
 #define ScribeItemAttendee		(ScribeItemBase + 12)
 #define ScribeItemGroup			(ScribeItemBase + 13)
 
 // System folder types
 #define SystemFolderInbox		0
 #define SystemFolderOutbox		1
 #define SystemFolderSent		2
 #define SystemFolderTrash		3
 #define SystemFolderContacts	4
 #define SystemFolderTemplates	5
 #define SystemFolderFilters		6
 #define SystemFolderCalendar	7
 #define SystemFolderGroups		8
 #define SystemFolderSpam		9
+
+// Mail flags
+#define ScribeMailSend			(1 << 0)
+#define ScribeMailReceived		(1 << 1)
+#define ScribeMailCreated		(1 << 2)
+#define ScribeMailForwarded		(1 << 3)
+#define ScribeMailReplies		(1 << 4)
+#define ScribeMailAttachments	(1 << 5)
+#define ScribeMailRead			(1 << 6)
+// 7 is deleted
+#define ScribeMailReadyToSend	(1 << 8)
+#define ScribeMailReadReceipt	(1 << 9)
+#define ScribeMailIgnore		(1 << 10)
+#define ScribeMailMonospace		(1 << 11)
+#define ScribeMailBounced		(1 << 12)
+#define ScribeMailBounce		(1 << 13)
+#define ScribeMailShowImages	(1 << 14)
+#define ScribeMailNew			(1 << 15)
+#define ScribeMailStoredFlat	(1 << 16)
+#define ScribeMailBayesHam		(1 << 17)
+#define ScribeMailBayesSpam		(1 << 18)
+// 19?
+#define ScribeMailHamDb			(1 << 20)
+#define ScribeMailSpamDb		(1 << 21)
+
diff --git a/src/AsyncOperationState.h b/src/AsyncOperationState.h
--- a/src/AsyncOperationState.h
+++ b/src/AsyncOperationState.h
@@ -1,314 +1,312 @@
 #pragma once
 
 #define DEBUG_ASYNC_OP_STATE		0
 #if DEBUG_ASYNC_OP_STATE
 #define LOG_ASYNC(...)				LgiTrace(__VA_ARGS__)
 #else
 #define LOG_ASYNC(...)
 #endif
 
 class AsyncOperationState
 {
 	static size_t Instances;
 	ScribeWnd *App = NULL;
 
 	// Input
 	ScribeFolder *Folder = NULL;
 	LArray<Thing*> Items;
 	bool CopyOnly;
 	std::function<void(bool, LArray<Store3Status>&)> Callback;
 
 	// Output
 	bool Result = false; // Overall success/failure
 	LArray<Store3Status> Status; // Per item status
-
 								 // State
-
 								 // Group all the mail in the same store into one operation:
 	LArray<LDataI*> InStoreMove;
 
 	LDataI *FolderObj = NULL;
 	LDataStoreI *FolderStore = NULL;
 	ScribeMailType NewBayesType = BayesMailUnknown;
 	LHashTbl<PtrKey<Thing*>, int> Map;
 	int NewFolderType = -1;
 	bool BuildDynMenus = false;
 	bool BayesInc = false;
 	size_t Moves = 0;
 
 	// Returns true the total operation is complete and
 	// 'this' object has been deleted. Ie exit immediately
 	// from the calling context.
 	bool SetStatus(int i, Store3Status s)
 	{
 		LAssert(Status[i] == Store3NotImpl);
 		Status[i] = s;
 
 		LAssert(Moves > 0);
 		Moves--;
 
 		if (Moves > 0)
 			return false;
 
 		OnComplete();
 		return true;
 	}
 
 public:
 	AsyncOperationState(ScribeFolder *folder,
 		LArray<Thing*> &items,
 		bool copyOnly,
 		std::function<void(bool, LArray<Store3Status>&)> callback) :
 		Folder(folder),
 		Items(items),
 		CopyOnly(copyOnly),
 		Callback(callback)
 	{
 		Instances++;
 		LOG_ASYNC("%p.AsyncOperationState f=%p items=%i copyOnly=%i inst=%i\n", this, folder, (int)items.Length(), copyOnly, (int)Instances);
 		
 		// Validate parameters
 		if (Folder &&
 			(App = Folder->App))
 		{
 			LVariant v;
 			if (App->GetOptions()->GetValue(OPT_BayesIncremental, v))
 				BayesInc = v.CastInt32() != 0;
 		}
 		else
 		{
 			delete this;
 			return;
 		}
 
 		if ((FolderObj = Folder->GetObject()))
 		{
 			FolderStore = Folder->GetObject()->GetStore();
 		}
 		LOG_ASYNC("%p.AsyncOperationState obj=%p store=%p\n", this, FolderObj, FolderStore);
 
 		Status.Length(Moves = Items.Length());
 		for (auto &s: Status)
 			s = Store3NotImpl;
 
 		auto FolderItemType = Folder->GetItemType();
 		auto ThisFolderPath = Folder->GetPath();
 		NewBayesType = App->BayesTypeFromPath(ThisFolderPath);
 		NewFolderType = App->GetFolderType(Folder);
 		ScribeFolder *TemplatesFolder = App->GetFolder(FOLDER_TEMPLATES);
 		BuildDynMenus = Folder == TemplatesFolder;
 
 		for (unsigned i=0; i<Items.Length(); i++)
 		{
 			auto t = Items[i];
 			if (!t || !t->GetObject())
 			{
 				LOG_ASYNC("%p.AsyncOperationState error[%i]: no object\n", this, i);
 				if (SetStatus(i, Store3Error))
 					return;
 				continue;
 			}
 
 			auto ThingItemType = t->Type();
 			if (FolderItemType != ThingItemType && FolderItemType != MAGIC_ANY)
 			{
 				LOG_ASYNC("%p.AsyncOperationState error[%i]: wrong type\n", this, i);
 				if (SetStatus(i, Store3Error))
 					return;
 				continue;
 			}
 
 			auto Old = t->GetFolder();
 			LString Path;
 			if (Old)
 			{
 				Path = Old->GetPath();
 
 				if (Old == TemplatesFolder)
 					// Moving to or from the templates folder... update the menu
 					BuildDynMenus = true;
 			}
 
 			if (Old && Path)
 			{
 				bool IsDeleted = false;
 				App->GetAccessLevel(App,
 					Old->GetFolderPerms(ScribeWriteAccess),
 					Path,
 					[this, i, t, &IsDeleted](bool Allow)
 					{
 						LOG_ASYNC("%p.AsyncOperationState i=%i GetAccessLevel=%i\n", this, i, Allow);
 						if (Allow)
 							IsDeleted = Move(i, t);
 						else
 							IsDeleted = SetStatus(i, Store3NoPermissions);
 					});
 				// If the callback has already been executed and the object is deleted, exit immediately.
 				if (IsDeleted)
 				{
 					LOG_ASYNC("%p.AsyncOperationState IsDeleted\n", this, i);
 					return;
 				}
 			}
 			else
 			{
 				if (Move(i, t))
 					return;
 			}
 		}
 
 	}
 
 	~AsyncOperationState()
 	{
 		Instances--;
 		LOG_ASYNC("%p.~AsyncOperationState inst=%i\n", this, (int)Instances);
 	}
 		
 	// This must call SetStatus once and only once for each item it's called with.
-	// Returns true if the SetStatus call indicates deletion.
+	// Returns true if the SetStatus call indicates AsyncOperationState deletion.
 	// 'this' will be invalid after SetStatus returns true.
 	bool Move(int i, Thing *t)
 	{
 		auto OldBayesType = BayesMailUnknown;
 		if (BayesInc &&
 			t->IsMail() &&
 			TestFlag(t->IsMail()->GetFlags(), MAIL_READ))
 		{
 			OldBayesType = App->BayesTypeFromPath(t->IsMail());
 		}
 
 		auto Old = t->GetFolder();
 		auto r = Store3NotImpl;
 
 		auto OldFolderType = Old ? App->GetFolderType(Old) : -1;
 		if ( (OldFolderType == FOLDER_TRASH || OldFolderType == FOLDER_SENT) &&
 			NewFolderType == FOLDER_TRASH)
 		{
 			// Delete for good
 			LOG_ASYNC("%p.Move[%i] DeleteThing(%p)\n", this, i, t);
 			r = Old ? Old->DeleteThing(t, NULL) : Store3Error;
 		}
 		else
 		{
 			// If this folder is currently selected...
 			if (Folder->Select())
 			{
 				// Insert item into list
 				t->SetFieldArray(Folder->FieldArray);
 			}
 
 			if (CopyOnly)
 			{
 				LDataI *NewT = FolderStore->Create(t->Type());
 				if (NewT)
 				{
 					NewT->CopyProps(*t->GetObject());
 					r = NewT->Save(Folder->GetObject());
 					LOG_ASYNC("%p.Move[%i] CopyOnly.Save(%p)=%i\n", this, i, t, r);
 				}
 				else
 				{
 					r = Store3Error;
 					LOG_ASYNC("%p.Move[%i] CopyOnly.Save error creating object\n", this, i);
 				}
 			}
 			else
 			{
 				if (NewFolderType != FOLDER_TRASH &&
 					OldBayesType != NewBayesType)
 				{
 					App->OnBayesianMailEvent(t->IsMail(), OldBayesType, NewBayesType);
 				}
 
 				// Move to this folder
 				auto o = t->GetObject();
 				if (o && o->GetStore() == FolderStore)
 				{
 					InStoreMove.Add(o);
 					Map.Add(t, i);
 					LOG_ASYNC("%p.Move[%i] InStoreMove.Add(%p)\n", this, i, o);
 					r = Store3Delayed;
 				}
 				else
 				{
 					bool Deleted = false;
 
 					// Out of store more... use the old single object method... for the moment..
 					LOG_ASYNC("%p.Move[%i] OutStoreMove.SetFolder(%p)\n", this, i, t);
 					t->SetFolder(Folder,
 						[this, Old, t, i, &Deleted](auto r)
 						{
 							LOG_ASYNC("%p.Move[%i] OutStoreMove.Cb t=%p r=%i\n", this, i, t, r);
 							if (r == Store3Success)
 							{
 								// Remove from the list..
 								if (Old && Old->Select() && App->GetMailList())
 									App->GetMailList()->Remove(t);
 								t->OnMove();
 							}
 
 							Deleted = SetStatus(i, r);
 						});
 
 					LOG_ASYNC("%p.Move[%i] OutStoreMove.SetFolder t=%p return false\n", this, i, t);
 					return Deleted;
 				}
 			}
 		}
 
 		LOG_ASYNC("%p.Move[%i] finished: t=%p r=%i\n", this, i, t, r);
 		if (r == Store3Success)
 			t->OnMove();
 
 		return SetStatus(i, r);
 	}
 
 	void OnComplete()
 	{
 		auto s = Store3NotImpl;
 
 		if (InStoreMove.Length())
 		{
 			auto Fld = dynamic_cast<LDataFolderI*>(Folder->GetObject());
 			if (!Fld)
 				s = Store3Error;
 			else
 				s = FolderStore->Move(Fld, InStoreMove);
 
 			LOG_ASYNC("%p.OnComplete InStoreMove=%i\n", this, s);
 
 			for (auto p: Map)
 			{
 				Status[p.value] = s;
 
 				if (s == Store3Success)
 				{
 					LAssert(p.key->GetFolder() == Folder);
 					LAssert(Items.HasItem(p.key));
 
 					p.key->OnMove();
 				}
 			}
 		}
 
 		// Calculate result based on the Status array:
 		Result = true;
 		for (auto s: Status)
 		{
 			if (s < Store3Delayed)
 				Result = false;
 		}
 
 		if (BuildDynMenus)
 			// Moving to or from the templates folder... update the menu
 			App->BuildDynMenus();
 
 		LOG_ASYNC("%p.OnComplete calling cb\n", this);
 		if (Callback)
 			Callback(Result, Status);
 
 		delete this;
 	}
 };