diff --git a/gui/griffon-app/conf/Config.groovy b/gui/griffon-app/conf/Config.groovy
index 009d9b80..e65fa576 100644
--- a/gui/griffon-app/conf/Config.groovy
+++ b/gui/griffon-app/conf/Config.groovy
@@ -96,4 +96,9 @@ mvcGroups {
         view = 'com.muwire.gui.CertificateWarningView'
         controller = 'com.muwire.gui.CertificateWarningController'
     }
+    'certificate-control' {
+        model = 'com.muwire.gui.CertificateControlModel'
+        view = 'com.muwire.gui.CertificateControlView'
+        controller = 'com.muwire.gui.CertificateControlController'
+    }
 }
diff --git a/gui/griffon-app/controllers/com/muwire/gui/CertificateControlController.groovy b/gui/griffon-app/controllers/com/muwire/gui/CertificateControlController.groovy
new file mode 100644
index 00000000..ace363b9
--- /dev/null
+++ b/gui/griffon-app/controllers/com/muwire/gui/CertificateControlController.groovy
@@ -0,0 +1,11 @@
+package com.muwire.gui
+
+import griffon.core.artifact.GriffonController
+import griffon.core.controller.ControllerAction
+import griffon.inject.MVCMember
+import griffon.metadata.ArtifactProviderFor
+import javax.annotation.Nonnull
+
+@ArtifactProviderFor(GriffonController)
+class CertificateControlController {
+}
\ No newline at end of file
diff --git a/gui/griffon-app/models/com/muwire/gui/CertificateControlModel.groovy b/gui/griffon-app/models/com/muwire/gui/CertificateControlModel.groovy
new file mode 100644
index 00000000..0914376f
--- /dev/null
+++ b/gui/griffon-app/models/com/muwire/gui/CertificateControlModel.groovy
@@ -0,0 +1,19 @@
+package com.muwire.gui
+
+import com.muwire.core.Core
+
+import griffon.core.artifact.GriffonModel
+import griffon.transform.Observable
+import griffon.metadata.ArtifactProviderFor
+
+@ArtifactProviderFor(GriffonModel)
+class CertificateControlModel {
+    def users = []
+    def certificates = []
+    
+    Core core
+    
+    void mvcGroupInit(Map<String,String> args) {
+        users.addAll(core.certificateManager.byIssuer.keySet())
+    }
+}
\ No newline at end of file
diff --git a/gui/griffon-app/views/com/muwire/gui/CertificateControlView.groovy b/gui/griffon-app/views/com/muwire/gui/CertificateControlView.groovy
new file mode 100644
index 00000000..14f06ed5
--- /dev/null
+++ b/gui/griffon-app/views/com/muwire/gui/CertificateControlView.groovy
@@ -0,0 +1,108 @@
+package com.muwire.gui
+
+import griffon.core.artifact.GriffonView
+import griffon.inject.MVCMember
+import griffon.metadata.ArtifactProviderFor
+import net.i2p.data.Base64
+
+import javax.swing.JDialog
+import javax.swing.ListSelectionModel
+import javax.swing.SwingConstants
+
+import com.muwire.core.Persona
+import com.muwire.core.filecert.Certificate
+
+import java.awt.BorderLayout
+import java.awt.event.WindowAdapter
+import java.awt.event.WindowEvent
+
+import javax.annotation.Nonnull
+
+@ArtifactProviderFor(GriffonView)
+class CertificateControlView {
+    @MVCMember @Nonnull
+    FactoryBuilderSupport builder
+    @MVCMember @Nonnull
+    CertificateControlModel model
+
+    def mainFrame
+    def dialog
+    def panel
+    def usersTable
+    def certsTable
+    def lastUsersSortEvent
+    
+    void initUI() {
+        mainFrame = application.windowManager.findWindow("main-frame")
+        int rowHeight = application.context.get("row-height")
+        dialog = new JDialog(mainFrame,"Certificates",true)
+        dialog.setResizable(true)
+        
+        panel = builder.panel {
+            borderLayout()
+            panel(constraints : BorderLayout.NORTH) {
+                label("Certificates in your repository")
+            }
+            panel (constraints : BorderLayout.CENTER) {
+                gridLayout(rows : 1, cols : 2)
+                scrollPane {
+                    usersTable = table(autoCreateRowSorter : true, rowHeight : rowHeight) {
+                        tableModel(list : model.users) {
+                            closureColumn(header : "Issuer", type : String, read : {it.getHumanReadableName()})
+                        }
+                    }
+                }
+                scrollPane {
+                    certsTable = table(autoCreateRowSorter : true, rowHeight : rowHeight) {
+                        tableModel(list : model.certificates) {
+                            closureColumn(header : "File Name", type : String, read : {it.name.name})
+                            closureColumn(header : "Hash", type : String, read : {Base64.encode(it.infoHash.getRoot())})
+                            closureColumn(header : "Timestamp", type : String, read : {
+                                def date = new Date(it.timestamp)
+                                date.toString()
+                            })
+                        }
+                    }
+                }
+            }
+        }
+    }
+    
+    void mvcGroupInit(Map<String,String> args) {
+        usersTable.rowSorter.addRowSorterListener({evt -> lastUsersSortEvent = evt})
+        def selectionModel = usersTable.getSelectionModel()
+        selectionModel.setSelectionMode(ListSelectionModel.SINGLE_SELECTION)
+        selectionModel.addListSelectionListener({
+            Persona issuer = getSelectedIssuer()
+            if (issuer == null)
+                return
+            Set<Certificate> certs = model.core.certificateManager.byIssuer.get(issuer)
+            if (certs == null)
+                return
+            model.certificates.clear()
+            model.certificates.addAll(certs)
+            certsTable.model.fireTableDataChanged()
+        })
+        
+        dialog.getContentPane().add(panel)
+        dialog.pack()
+        dialog.setLocationRelativeTo(mainFrame)
+        dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE)
+        dialog.addWindowListener(new WindowAdapter() {
+            public void windowClosed(WindowEvent e) {
+                mvcGroup.destroy()
+            }
+        })
+        dialog.show()
+    }
+    
+    private Persona getSelectedIssuer() {
+        int selectedRow = usersTable.getSelectedRow()
+        if (selectedRow < 0)
+            return null
+        if (lastUsersSortEvent != null)
+            selectedRow = usersTable.rowSorter.convertRowIndexToModel(selectedRow)
+        model.users[selectedRow]
+    }
+    
+}
\ No newline at end of file
diff --git a/gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy b/gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy
index f09293c8..3379df1b 100644
--- a/gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy
+++ b/gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy
@@ -122,6 +122,11 @@ class MainFrameView {
                             env["core"] = model.core
                             mvcGroup.createMVCGroup("advanced-sharing",env)  
                         })
+                        menuItem("Certificates", actionPerformed : {
+                            def env = [:]
+                            env['core'] = model.core
+                            mvcGroup.createMVCGroup("certificate-control",env)
+                        })
                     }
                 }
                 borderLayout()