diff --git a/seahub/api2/urls.py b/seahub/api2/urls.py
index c57116558d..c778fb41e8 100644
--- a/seahub/api2/urls.py
+++ b/seahub/api2/urls.py
@@ -39,7 +39,7 @@ urlpatterns = patterns('',
     # Folowing is only for debug, will be removed 
     #url(r'^html/newreply2/$', api_new_replies),
     #url(r'^html/events2/$', activity2),
-    #url(r'^html/more_events/$', events2),
+    #url(r'^html/more_events/$', events2, name="more_events"),
     #url(r'^html/repo_history_changes/(?P<repo_id>[-0-9a-f]{36})/$', api_repo_history_changes, name='api_repo_history_changes'),
 
     #url(r'^html/discussions2/(?P<group_id>\d+)/$', discussions2, name="api_discussions2"),
diff --git a/seahub/api2/views.py b/seahub/api2/views.py
index d74e94fe5f..75e82adb55 100644
--- a/seahub/api2/views.py
+++ b/seahub/api2/views.py
@@ -306,9 +306,12 @@ class Repos(APIView):
                 "root":r.root,
                 "size":r.size,
                 "encrypted":r.encrypted,
-                "enc_version":r.enc_version,
                 "permission": 'rw', # Always have read-write permission to owned repo
                 }
+            if r.encrypted:
+                repo["enc_version"] = r.enc_version
+                repo["magic"] = r.magic
+                repo["random_key"] = r.random_key
             repos_json.append(repo)
 
         shared_repos = seafile_api.get_share_in_repo_list(email, -1, -1)
@@ -331,9 +334,12 @@ class Repos(APIView):
                 "root":r.root,
                 "size":r.size,
                 "encrypted":r.encrypted,
-                "enc_version":r.enc_version,
                 "permission": r.permission,
                 }
+            if r.encrypted:
+                repo["enc_version"] = r.enc_version
+                repo["magic"] = r.magic
+                repo["random_key"] = r.random_key
             repos_json.append(repo)
 
         groups = get_personal_groups_by_user(email)
@@ -353,11 +359,13 @@ class Repos(APIView):
                     "root":r.root,
                     "size":r.size,
                     "encrypted":r.encrypted,
-                    "enc_version":r.enc_version,
                     "permission": check_permission(r.id, email),
                     }
+                if r.encrypted:
+                    repo["enc_version"] = r.enc_version
+                    repo["magic"] = r.magic
+                    repo["random_key"] = r.random_key
                 repos_json.append(repo)
-
         return Response(repos_json)
 
     def post(self, request, format=None):
@@ -478,10 +486,13 @@ class Repo(APIView):
             "mtime":repo.latest_modify,
             "size":repo.size,
             "encrypted":repo.encrypted,
-            "enc_version":repo.encversion,
             "root":root_id,
             "permission": check_permission(repo.id, username),
             }
+        if repo.encrypted:
+            repo_json["enc_version"] = repo.enc_version
+            repo_json["magic"] = repo.magic
+            repo_json["random_key"] = repo.random_key
 
         return Response(repo_json)