diff --git a/admin/models.py b/admin/models.py
index b618b5d6b..79d50cbe0 100644
--- a/admin/models.py
+++ b/admin/models.py
@@ -95,27 +95,27 @@ class Domain(DatesAware):
     mailbox_count = property(__mailbox_count)
 
     def create_dir(self):
-	if parameters.get_admin("CREATE_DIRECTORIES") == "yes":
-		path = "%s/%s" % (parameters.get_admin("STORAGE_PATH"), self.name)
-		return exec_as_vuser("mkdir -p %s" % path)
-	else:
-		return True
+    if parameters.get_admin("CREATE_DIRECTORIES") == "yes":
+        path = "%s/%s" % (parameters.get_admin("STORAGE_PATH"), self.name)
+        return exec_as_vuser("mkdir -p %s" % path)
+    else:
+        return True
 
     def rename_dir(self, oldname):
-	if parameters.get_admin("CREATE_DIRECTORIES") == "yes":
-		stpath = parameters.get_admin("STORAGE_PATH")
-		return exec_as_vuser("mv %s/%s %s/%s" \
-					 % (stpath, oldname, stpath, self.name))
-	else:
-		return True
+    if parameters.get_admin("CREATE_DIRECTORIES") == "yes":
+        stpath = parameters.get_admin("STORAGE_PATH")
+        return exec_as_vuser("mv %s/%s %s/%s" \
+                     % (stpath, oldname, stpath, self.name))
+    else:
+        return True
 
     def delete_dir(self):
-	if parameters.get_admin("CREATE_DIRECTORIES") == "yes":
-		return exec_as_vuser("rm -r %s/%s" \
-					 % (parameters.get_admin("STORAGE_PATH"), 
-					    self.name))
-	else:
-		return True
+    if parameters.get_admin("CREATE_DIRECTORIES") == "yes":
+        return exec_as_vuser("rm -r %s/%s" \
+                     % (parameters.get_admin("STORAGE_PATH"), 
+                        self.name))
+    else:
+        return True
 
     def delete(self, *args, **kwargs):
         keepdir = False
@@ -199,51 +199,51 @@ class Mailbox(DatesAware):
     alias_count = property(__alias_count)
 
     def create_dir(self):
-	if parameters.get_admin("CREATE_DIRECTORIES") == "yes":
-		relpath = "%s/%s" % (self.domain.name, self.address)
-		abspath = os.path.join(parameters.get_admin("STORAGE_PATH"), relpath)
-		if self.mbtype == "mbox":
-		    self.path = "%s/Inbox" % self.address
-		else:
-		    self.path = "%s/" % self.address
-		if os.path.exists(abspath):
-		    return True
-		if not exec_as_vuser("mkdir -p %s" % abspath):
-		    return False
-		if self.mbtype == "mbox":
-		    template = ["Inbox", "Drafts", "Sent", "Trash", "Junk"]
-		    for f in template:
-			exec_as_vuser("touch %s/%s" % (abspath, f))
-		else:
-		    template = [".Drafts/", ".Sent/", ".Trash/", ".Junk/"]
-		    for dir in template:
-			for sdir in ["cur", "new", "tmp"]:
-			    exec_as_vuser("mkdir -p %s/%s/%s/%s" \
-					      % (abspath, self.mdirroot, dir, sdir))
-		return True
-	else:
-		return True
+    if parameters.get_admin("CREATE_DIRECTORIES") == "yes":
+        relpath = "%s/%s" % (self.domain.name, self.address)
+        abspath = os.path.join(parameters.get_admin("STORAGE_PATH"), relpath)
+        if self.mbtype == "mbox":
+            self.path = "%s/Inbox" % self.address
+        else:
+            self.path = "%s/" % self.address
+        if os.path.exists(abspath):
+            return True
+        if not exec_as_vuser("mkdir -p %s" % abspath):
+            return False
+        if self.mbtype == "mbox":
+            template = ["Inbox", "Drafts", "Sent", "Trash", "Junk"]
+            for f in template:
+            exec_as_vuser("touch %s/%s" % (abspath, f))
+        else:
+            template = [".Drafts/", ".Sent/", ".Trash/", ".Junk/"]
+            for dir in template:
+            for sdir in ["cur", "new", "tmp"]:
+                exec_as_vuser("mkdir -p %s/%s/%s/%s" \
+                          % (abspath, self.mdirroot, dir, sdir))
+        return True
+    else:
+        return True
 
     def rename_dir(self, domain, newaddress):
-	if parameters.get_admin("CREATE_DIRECTORIES") == "yes":
-		if self.domain.name == domain and newaddress == self.address:
-		    return True
-		path = "%s/%s" % (parameters.get_admin("STORAGE_PATH"), domain)
-		code = exec_as_vuser("mv %s/%s %s/%s" \
-					 % (path, self.address, path, newaddress))
-		if code:
-		    self.path = "%s/" % newaddress
-		return code
-	else:
-		return True
+    if parameters.get_admin("CREATE_DIRECTORIES") == "yes":
+        if self.domain.name == domain and newaddress == self.address:
+            return True
+        path = "%s/%s" % (parameters.get_admin("STORAGE_PATH"), domain)
+        code = exec_as_vuser("mv %s/%s %s/%s" \
+                     % (path, self.address, path, newaddress))
+        if code:
+            self.path = "%s/" % newaddress
+        return code
+    else:
+        return True
 
     def delete_dir(self):
-	if parameters.get_admin("CREATE_DIRECTORIES") == "yes":
-		return exec_as_vuser("rm -r %s/%s/%s" \
-					 % (parameters.get_admin("STORAGE_PATH"),
-					    self.domain.name, self.address))
-	else:
-		return True
+    if parameters.get_admin("CREATE_DIRECTORIES") == "yes":
+        return exec_as_vuser("rm -r %s/%s/%s" \
+                     % (parameters.get_admin("STORAGE_PATH"),
+                        self.domain.name, self.address))
+    else:
+        return True
 
     def save(self, *args, **kwargs):
         if not self.create_dir():