diff --git a/addons/document/nodes.py b/addons/document/nodes.py
index 6bcb2237a9e..aeb2e64fc97 100644
--- a/addons/document/nodes.py
+++ b/addons/document/nodes.py
@@ -823,6 +823,7 @@ class node_res_dir(node_class):
         uid = self.context.uid
         ctx = self.context.context.copy()
         ctx.update(self.dctx)
+        ctx.update(self.context.extra_ctx)
         where = []
         if self.domain:
             app = safe_eval(self.domain, ctx)
diff --git a/addons/document_webdav/document_webdav.py b/addons/document_webdav/document_webdav.py
index 3b604d6cffb..ad44a58ac26 100644
--- a/addons/document_webdav/document_webdav.py
+++ b/addons/document_webdav/document_webdav.py
@@ -51,9 +51,10 @@ class document_davdir(osv.osv):
         # that might be not worth preparing.
         nctx.extra_ctx['webdav_path'] = '/'+config.get_misc('webdav','vdir','webdav')
         usr_obj = self.pool.get('res.users')
-        res = usr_obj.read(cr, uid, uid, ['login'])
+        res = usr_obj.read(cr, uid, uid, ['login','context_lang'])
         if res:
             nctx.extra_ctx['username'] = res['login']
+            nctx.extra_ctx['lang'] = res['context_lang']
         # TODO group
         return