 	public func createAccount(type: AccountType, username: String? = nil, password: String? = nil) -> Account {
 		
 		let accountID = UUID().uuidString
-		let accountFolder = (accountsFolder as NSString).appendingPathComponent(accountID)
+		let accountFolder = (accountsFolder as NSString).appendingPathComponent("\(type.rawValue)_\(accountID)")
 
 		do {
 			try FileManager.default.createDirectory(atPath: accountFolder, withIntermediateDirectories: true, attributes: nil)


private struct AccountSpecifier {

	let type: String
	let identifier: String
	let folderPath: String
	let folderName: String

		defaultAccount = Account(dataFolder: localAccountFolder, type: .onMyMac, accountID: defaultAccountIdentifier)!
        accountsDictionary[defaultAccount.accountID] = defaultAccount

		readAccountsFromDisk()

		NotificationCenter.default.addObserver(self, selector: #selector(unreadCountDidChange(_:)), name: .UnreadCountDidChange, object: nil)
		
