diff --git a/apps/document_indexing/__init__.py b/apps/document_indexing/__init__.py
index 44021889d7..cce1676648 100644
--- a/apps/document_indexing/__init__.py
+++ b/apps/document_indexing/__init__.py
@@ -1,6 +1,8 @@
 from __future__ import absolute_import
 
 from django.utils.translation import ugettext_lazy as _
+from django.dispatch import receiver
+from django.db.models.signals import post_save, pre_delete
 
 from navigation.api import (register_top_menu, register_sidebar_template,
     register_links)
@@ -18,6 +20,7 @@ from .permissions import (PERMISSION_DOCUMENT_INDEXING_VIEW,
     PERMISSION_DOCUMENT_INDEXING_EDIT,
     PERMISSION_DOCUMENT_INDEXING_DELETE
 )
+from .api import update_indexes, delete_indexes
 
 
 def is_root_node(context):
@@ -63,3 +66,16 @@ register_links([Index, 'index_setup_list', 'index_setup_create', 'template_node_
 register_links(Index, [index_setup_edit, index_setup_delete, index_setup_view])
 
 register_links(IndexTemplateNode, [template_node_create, template_node_edit, template_node_delete])
+
+
+@receiver(post_save, dispatch_uid='document_index_update', sender=Document)
+def document_index_update(sender, **kwargs):
+    # TODO: save result in user msg queue
+    delete_indexes(kwargs['instance'])
+    update_indexes(kwargs['instance'])
+
+
+@receiver(pre_delete, dispatch_uid='document_index_delete', sender=Document)
+def document_index_delete(sender, **kwargs):
+    # TODO: save result in user msg queue    
+    delete_indexes(kwargs['instance'])
diff --git a/apps/documents/views.py b/apps/documents/views.py
index 3b584e076b..be6ad21950 100644
--- a/apps/documents/views.py
+++ b/apps/documents/views.py
@@ -28,7 +28,6 @@ from converter.office_converter import OfficeConverter
 from filetransfers.api import serve_file
 from navigation.utils import resolve_to_name
 from permissions.models import Permission
-from document_indexing.api import update_indexes, delete_indexes
 from acls.models import AccessEntry
 from common.compressed_files import CompressedFile
 
@@ -195,11 +194,6 @@ def document_delete(request, document_id=None, document_id_list=None):
     if request.method == 'POST':
         for document in documents:
             try:
-                warnings = delete_indexes(document)
-                if request.user.is_staff or request.user.is_superuser:
-                    for warning in warnings:
-                        messages.warning(request, warning)
-
                 document.delete()
                 #create_history(HISTORY_DOCUMENT_DELETED, data={'user': request.user, 'document': document})
                 messages.success(request, _(u'Document deleted successfully.'))
@@ -244,11 +238,6 @@ def document_edit(request, document_id):
         old_document = copy.copy(document)
         form = DocumentForm_edit(request.POST, instance=document)
         if form.is_valid():
-            warnings = delete_indexes(document)
-            if request.user.is_staff or request.user.is_superuser:
-                for warning in warnings:
-                    messages.warning(request, warning)
-
             document.filename = form.cleaned_data['new_filename']
             document.description = form.cleaned_data['description']
 
@@ -261,12 +250,6 @@ def document_edit(request, document_id):
             RecentDocument.objects.add_document_for_user(request.user, document)
 
             messages.success(request, _(u'Document "%s" edited successfully.') % document)
-
-            warnings = update_indexes(document)
-            if request.user.is_staff or request.user.is_superuser:
-                for warning in warnings:
-                    messages.warning(request, warning)
-
             return HttpResponseRedirect(document.get_absolute_url())
     else:
         form = DocumentForm_edit(instance=document, initial={