diff --git a/greenmine/projects/admin.py b/greenmine/projects/admin.py
index d97e0eeb..e9548b6d 100644
--- a/greenmine/projects/admin.py
+++ b/greenmine/projects/admin.py
@@ -1,19 +1,26 @@
 # -*- coding: utf-8 -*-
 
 from django.contrib import admin
-import reversion
+from django.contrib.contenttypes import generic
 
 from greenmine.projects.milestones.admin import MilestoneInline
 from . import models
 
+import reversion
 
 
 class AttachmentAdmin(reversion.VersionAdmin):
-    list_display = ["id", "owner"]
+    list_display = ["project", "attached_file", "owner"]
 
 admin.site.register(models.Attachment, AttachmentAdmin)
 
 
+class AttachmentInline(generic.GenericTabularInline):
+     model = models.Attachment
+     fields = ("attached_file", "owner")
+     extra = 0
+
+
 class MembershipAdmin(admin.ModelAdmin):
     list_display = ['project', 'role', 'user']
     list_filter = ['project', 'role']
diff --git a/greenmine/projects/issues/admin.py b/greenmine/projects/issues/admin.py
index 57c37831..987a00d0 100644
--- a/greenmine/projects/issues/admin.py
+++ b/greenmine/projects/issues/admin.py
@@ -2,6 +2,8 @@
 
 from django.contrib import admin
 
+from greenmine.projects.admin import AttachmentInline
+
 from . import models
 
 import reversion
@@ -9,5 +11,6 @@ import reversion
 
 class IssueAdmin(reversion.VersionAdmin):
     list_display = ["subject", "type"]
+    inlines = [AttachmentInline]
 
 admin.site.register(models.Issue, IssueAdmin)
diff --git a/greenmine/projects/questions/admin.py b/greenmine/projects/questions/admin.py
index a0e2044c..e3ceca99 100644
--- a/greenmine/projects/questions/admin.py
+++ b/greenmine/projects/questions/admin.py
@@ -2,6 +2,8 @@
 
 from django.contrib import admin
 
+from greenmine.projects.admin import AttachmentInline
+
 from . import models
 
 import reversion
@@ -9,5 +11,6 @@ import reversion
 
 class QuestionAdmin(reversion.VersionAdmin):
     list_display = ["subject", "project", "owner"]
+    inlines = [AttachmentInline]
 
 admin.site.register(models.Question, QuestionAdmin)
diff --git a/greenmine/projects/tasks/admin.py b/greenmine/projects/tasks/admin.py
index f5236a24..80d6ed72 100644
--- a/greenmine/projects/tasks/admin.py
+++ b/greenmine/projects/tasks/admin.py
@@ -2,6 +2,8 @@
 
 from django.contrib import admin
 
+from greenmine.projects.admin import AttachmentInline
+
 from . import models
 
 import reversion
@@ -10,6 +12,7 @@ import reversion
 class TaskAdmin(reversion.VersionAdmin):
     list_display = ["subject", "ref", "user_story", "milestone", "project", "user_story_id"]
     list_filter = ["user_story", "milestone", "project"]
+    inlines = [AttachmentInline]
 
     def user_story_id(self, instance):
         return instance.user_story.id
diff --git a/greenmine/projects/userstories/admin.py b/greenmine/projects/userstories/admin.py
index fb673dc7..454ae5cc 100644
--- a/greenmine/projects/userstories/admin.py
+++ b/greenmine/projects/userstories/admin.py
@@ -2,6 +2,8 @@
 
 from django.contrib import admin
 
+from greenmine.projects.admin import AttachmentInline
+
 from .  import models
 
 import reversion
@@ -29,6 +31,6 @@ class RolePointsInline(admin.TabularInline):
 class UserStoryAdmin(reversion.VersionAdmin):
     list_display = ["id", "ref", "milestone", "project", "owner", 'status', 'is_closed']
     list_filter = ["milestone", "project"]
-    inlines = [RolePointsInline]
+    inlines = [RolePointsInline, AttachmentInline]
 
 admin.site.register(models.UserStory, UserStoryAdmin)
diff --git a/greenmine/projects/wiki/admin.py b/greenmine/projects/wiki/admin.py
index c3bc73ba..96987811 100644
--- a/greenmine/projects/wiki/admin.py
+++ b/greenmine/projects/wiki/admin.py
@@ -3,9 +3,12 @@
 from django.contrib import admin
 
 from greenmine.projects.wiki.models import WikiPage
+from greenmine.projects.admin import AttachmentInline
 
+from . import models
 
 class WikiPageAdmin(admin.ModelAdmin):
-    list_display = ["slug", "project", "owner"]
+    list_display = ["project", "slug", "owner"]
+    inlines = [AttachmentInline]
 
-admin.site.register(WikiPage, WikiPageAdmin)
+admin.site.register(models.WikiPage, WikiPageAdmin)