@@ -0,0 +1,19 @@
+package com.fsck.k9.mail;
+
+
+import java.util.UUID;
+
+
+public class UUIDGenerator {
+    private static final UUIDGenerator INSTANCE = new UUIDGenerator();
+
+    public static UUIDGenerator getInstance() {
+        return INSTANCE;
+    }
+
+    private UUIDGenerator() { }
+
+    public UUID generateUUID() {
+        return UUID.randomUUID();
+    }
+}
I'd prefer this to be `UuidGenerator`.