diff --git a/django_mailbox/migrations/0005_auto_20160523_2240.py b/django_mailbox/migrations/0005_auto_20160523_2240.py
index f4bdae6..525d2c0 100644
--- a/django_mailbox/migrations/0005_auto_20160523_2240.py
+++ b/django_mailbox/migrations/0005_auto_20160523_2240.py
@@ -12,6 +12,6 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='messageattachment',
             name='document',
-            field=models.FileField(upload_to=django_mailbox.utils.get_attachment_save_path, verbose_name='Document'),
+            field=models.FileField(upload_to=django_mailbox.utils.get_save_path(setting='attachment_upload_to'), verbose_name='Document'),
         ),
     ]
diff --git a/django_mailbox/utils.py b/django_mailbox/utils.py
index 82a52d2..51204ed 100644
--- a/django_mailbox/utils.py
+++ b/django_mailbox/utils.py
@@ -5,7 +5,6 @@ import os
 
 from django.conf import settings
 
-
 logger = logging.getLogger(__name__)
 
 
@@ -144,14 +143,16 @@ def get_body_from_message(message, maintype, subtype):
     return body
 
 
-def get_save_path(instance, filename, setting):
-    settings = get_settings()
+def get_save_path(setting):
+    def _tmp(instance, filename):
+        settings = get_settings()
 
-    path = settings[setting]
-    if '%' in path:
-        path = datetime.datetime.utcnow().strftime(path)
+        path = settings[setting]
+        if '%' in path:
+            path = datetime.datetime.utcnow().strftime(path)
 
-    return os.path.join(
-        path,
-        filename,
-    )
\ No newline at end of file
+        return os.path.join(
+            path,
+            filename,
+        )
+    return _tmp