diff --git a/CMakeLists.txt b/CMakeLists.txt
index 852ffe4b8..22dabcc63 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,472 +1,473 @@
 cmake_minimum_required(VERSION 3.0)
 
 # KDE Application Version, managed by release script
 set (KDE_APPLICATIONS_VERSION_MAJOR "18")
 set (KDE_APPLICATIONS_VERSION_MINOR "11")
 set (KDE_APPLICATIONS_VERSION_MICRO "70")
 set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}")
 
 project(okular VERSION 1.5.${KDE_APPLICATIONS_VERSION_MICRO})
 
 set(QT_REQUIRED_VERSION "5.8.0")
 set(KF5_REQUIRED_VERSION "5.33.0")
 
 find_package(ECM 5.33.0 CONFIG REQUIRED)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
 
 include(ECMInstallIcons)
 include(ECMSetupVersion)
 include(ECMOptionalAddSubdirectory)
 include(GenerateExportHeader)
 include(FeatureSummary)
 include(ECMAddAppIcon)
 include(KDECompilerSettings NO_POLICY_SCOPE)
 include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(ECMAddTests)
 include(ECMAddAppIcon)
 include(CMakePackageConfigHelpers)
 
 ecm_setup_version(${PROJECT_VERSION}
                   VARIABLE_PREFIX OKULAR
                   VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/core/version.h"
                   PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/Okular5ConfigVersion.cmake")
 
 find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED COMPONENTS Core DBus Test Widgets PrintSupport Svg Qml Quick)
 find_package(Qt5 ${QT_REQUIRED_VERSION} OPTIONAL_COMPONENTS TextToSpeech)
 if (NOT Qt5TextToSpeech_FOUND)
     message(STATUS "Qt5TextToSpeech not found, speech features will be disabled")
 else()
     add_definitions(-DHAVE_SPEECH)
 endif()
 
 if(NOT CMAKE_VERSION VERSION_LESS "3.10.0")
   # CMake 3.9+ warns about automoc on files without Q_OBJECT, and doesn't know about other macros.
   # 3.10+ lets us provide more macro names that require automoc.
   list(APPEND CMAKE_AUTOMOC_MACRO_NAMES "OKULAR_EXPORT_PLUGIN")
 endif()
 
 set(optionalComponents)
 if (ANDROID)
 #   we want to make sure that generally all components are found
 
     set(optionalComponents "OPTIONAL_COMPONENTS")
 endif()
 
 find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS
     Archive
     Bookmarks
     Completion
     Config
     ConfigWidgets
     CoreAddons
     Crash
     IconThemes
     KIO
     Parts
     ThreadWeaver
     WindowSystem
     ${optionalComponents}
     DocTools
     JS
     Wallet
 )
 
 if(KF5Wallet_FOUND)
     add_definitions(-DWITH_KWALLET=1)
 endif()
 if(KF5JS_FOUND)
     add_definitions(-DWITH_KJS=1)
 endif()
 
 if(NOT WIN32 AND NOT ANDROID)
     find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS
         Activities
     )
     set_package_properties("KF5Activities" PROPERTIES
         DESCRIPTION  "Activities interface library"
         URL "https://api.kde.org/frameworks/kactivities/html/"
         TYPE RECOMMENDED
         PURPOSE "Required for Activities integration.")
 endif()
 find_package(KF5Kirigami2)
 set_package_properties(KF5Kirigami2 PROPERTIES
     DESCRIPTION "A QtQuick based components set"
     PURPOSE "Required at runtime by the mobile app"
     TYPE RUNTIME
 )
 find_package(Phonon4Qt5 CONFIG REQUIRED)
 find_package(KDEExperimentalPurpose)
 set_package_properties(KDEExperimentalPurpose PROPERTIES
     DESCRIPTION "A framework for services and actions integration"
     PURPOSE "Required for enabling the share menu in Okular"
     TYPE OPTIONAL
 )
 if (KDEExperimentalPurpose_FOUND)
     set(PURPOSE_FOUND 1)
 else()
     set(PURPOSE_FOUND 0)
 endif()
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake/modules)
 
 find_package(ZLIB REQUIRED)
 
 # This is here instead of in generators since we use if(Poppler_Qt5_FOUND) in autotests/
 find_package(Poppler "0.12.1" COMPONENTS Qt5)
 set_package_properties("Poppler" PROPERTIES
         TYPE RECOMMENDED
         PURPOSE "Support for PDF files in okular.")
 
 add_definitions(-DQT_USE_FAST_OPERATOR_PLUS)
 add_definitions(-DTRANSLATION_DOMAIN="okular")
 add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${PHONON_INCLUDES} core/synctex ${ZLIB_INCLUDE_DIR} ${CMAKE_BINARY_DIR}/core)
 
 option(BUILD_OKULARKIRIGAMI "Builds the touch-friendly frontend" ON)
 if (BUILD_OKULARKIRIGAMI)
     add_subdirectory( mobile )
 endif()
 option(BUILD_COVERAGE "Build the project with gcov support" OFF)
 
 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5.0.0")
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsuggest-override" )
     endif()
 endif()
 
 if(BUILD_COVERAGE)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage")
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lgcov")
 endif()
 
 add_subdirectory( ui )
 add_subdirectory( shell )
 add_subdirectory( generators )
 if(BUILD_TESTING)
    add_subdirectory( autotests )
    add_subdirectory( conf/autotests )
 endif()
 
 if(KF5DocTools_FOUND)
     add_subdirectory(doc)
 endif()
 
 include(OkularConfigureChecks.cmake)
 
 if(NOT WIN32)
  set(MATH_LIB m)
 else(NOT WIN32)
  set(MATH_LIB)
 endif(NOT WIN32)
 
 # okularcore
 
 set(okularcore_SRCS
    core/action.cpp
    core/annotations.cpp
    core/area.cpp
    core/audioplayer.cpp
    core/bookmarkmanager.cpp
    core/chooseenginedialog.cpp
    core/document.cpp
    core/documentcommands.cpp
    core/fontinfo.cpp
    core/form.cpp
    core/generator.cpp
    core/generator_p.cpp
    core/misc.cpp
    core/movie.cpp
    core/observer.cpp
    core/debug.cpp
    core/page.cpp
    core/pagecontroller.cpp
    core/pagesize.cpp
    core/pagetransition.cpp
    core/rotationjob.cpp
    core/scripter.cpp
    core/sound.cpp
    core/sourcereference.cpp
    core/textdocumentgenerator.cpp
    core/textdocumentsettings.cpp
    core/textpage.cpp
    core/tilesmanager.cpp
    core/utils.cpp
    core/view.cpp
    core/fileprinter.cpp
    core/signatureutils.cpp
    core/script/event.cpp
    core/synctex/synctex_parser.c
    core/synctex/synctex_parser_utils.c
 )
 qt5_add_resources(okularcore_SRCS
    core/script/builtin.qrc
 )
 
 ki18n_wrap_ui(okularcore_SRCS
    conf/textdocumentsettings.ui
 )
 
 install( FILES
            core/action.h
            core/annotations.h
            core/area.h
            core/document.h
            core/fontinfo.h
            core/form.h
            core/generator.h
            core/global.h
            core/page.h
            core/pagesize.h
            core/pagetransition.h
            core/sound.h
            core/sourcereference.h
            core/textdocumentgenerator.h
            core/textdocumentsettings.h
            core/textpage.h
            core/tile.h
            core/utils.h
            core/fileprinter.h
            core/observer.h
            ${CMAKE_CURRENT_BINARY_DIR}/core/version.h
            ${CMAKE_CURRENT_BINARY_DIR}/core/okularcore_export.h
            ${CMAKE_CURRENT_BINARY_DIR}/settings_core.h
          DESTINATION ${KDE_INSTALL_INCLUDEDIR}/okular/core COMPONENT Devel)
 
 install( FILES
            interfaces/configinterface.h
            interfaces/guiinterface.h
            interfaces/printinterface.h
            interfaces/saveinterface.h
            interfaces/viewerinterface.h
          DESTINATION ${KDE_INSTALL_INCLUDEDIR}/okular/interfaces COMPONENT Devel)
 
 ki18n_wrap_ui(okularcore_SRCS
    core/chooseenginewidget.ui
 )
 
 kconfig_add_kcfg_files(okularcore_SRCS conf/settings_core.kcfgc)
 
 add_library(okularcore SHARED ${okularcore_SRCS})
 generate_export_header(okularcore BASE_NAME okularcore EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/core/okularcore_export.h")
 
 if (ANDROID)
     set(fileName ${CMAKE_BINARY_DIR}/Okular5Core-android-dependencies.xml)
     file(WRITE "${fileName}" "<rules><dependencies><lib name='Okular5Core'><depends>\n"
                                 "<bundled file='${KDE_INSTALL_PLUGINDIR}/okular/generators' />\n"
                              "</depends></lib></dependencies></rules>\n")
     install(FILES ${fileName} DESTINATION ${KDE_INSTALL_LIBDIR})
 endif()
 
 
 # Special handling for linking okularcore on OSX/Apple
 IF(APPLE)
     SET(OKULAR_IOKIT "-framework IOKit" CACHE STRING "Apple IOKit framework")
 ENDIF(APPLE)
 
 # Extra library needed by imported synctex code on Windows
 if(WIN32)
     set(SHLWAPI shlwapi)
 endif(WIN32)
 
 target_link_libraries(okularcore
 PRIVATE
     ${OKULAR_IOKIT}
     ${SHLWAPI}
     KF5::Archive
     KF5::KIOCore
     KF5::KIOWidgets
     KF5::I18n
     KF5::ThreadWeaver
     KF5::Bookmarks
     Phonon::phonon4qt5
     ${MATH_LIB}
     ${ZLIB_LIBRARIES}
 PUBLIC  # these are included from the installed headers
     KF5::CoreAddons
     KF5::XmlGui
     KF5::ConfigGui
     Qt5::PrintSupport
     Qt5::Widgets
 )
 
 
 if (KF5Wallet_FOUND)
     target_link_libraries(okularcore PRIVATE KF5::Wallet)
 endif()
 if (KF5JS_FOUND)
     target_sources(okularcore PRIVATE
             core/script/executor_kjs.cpp
             core/script/kjs_app.cpp
             core/script/kjs_console.cpp
             core/script/kjs_data.cpp
             core/script/kjs_document.cpp
             core/script/kjs_field.cpp
             core/script/kjs_fullscreen.cpp
             core/script/kjs_field.cpp
             core/script/kjs_spell.cpp
             core/script/kjs_util.cpp
             core/script/kjs_event.cpp
     )
     target_link_libraries(okularcore PRIVATE KF5::JS KF5::JSApi)
 endif()
 
 set_target_properties(okularcore PROPERTIES VERSION 9.0.0 SOVERSION 9 OUTPUT_NAME Okular5Core EXPORT_NAME Core)
 
 install(TARGETS okularcore EXPORT Okular5Targets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 
 install(FILES conf/okular.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR})
 install(FILES conf/okular_core.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR})
 install(FILES core/okularGenerator.desktop DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR})
 
 # okularpart
 
 set(okularpart_conf_SRCS
    conf/preferencesdialog.cpp
    conf/dlgaccessibility.cpp
    conf/dlgdebug.cpp
    conf/dlgeditor.cpp
    conf/dlggeneral.cpp
    conf/dlgannotations.cpp
    conf/dlgperformance.cpp
    conf/dlgpresentation.cpp
    conf/editannottooldialog.cpp
    conf/editdrawingtooldialog.cpp
    conf/widgetannottools.cpp
    conf/widgetconfigurationtoolsbase.cpp
    conf/widgetdrawingtools.cpp
 )
 
 set(okularpart_SRCS
    ${okularpart_conf_SRCS}
    part.cpp
    extensions.cpp
    ui/embeddedfilesdialog.cpp
    ui/annotwindow.cpp
    ui/annotationmodel.cpp
    ui/annotationpopup.cpp
    ui/annotationpropertiesdialog.cpp
    ui/annotationproxymodels.cpp
    ui/annotationtools.cpp
    ui/annotationwidgets.cpp
    ui/bookmarklist.cpp
+   ui/certificateviewer.cpp
    ui/debug_ui.cpp
    ui/drawingtoolactions.cpp
    ui/fileprinterpreview.cpp
    ui/findbar.cpp
    ui/formwidgets.cpp
    ui/guiutils.cpp
    ui/ktreeviewsearchline.cpp
    ui/latexrenderer.cpp
    ui/minibar.cpp
    ui/okmenutitle.cpp
    ui/pageitemdelegate.cpp
    ui/pagepainter.cpp
    ui/pagesizelabel.cpp
    ui/pageviewannotator.cpp
    ui/pageviewmouseannotation.cpp
    ui/pageview.cpp
    ui/magnifierview.cpp
    ui/pageviewutils.cpp
    ui/presentationsearchbar.cpp
    ui/presentationwidget.cpp
    ui/propertiesdialog.cpp
    ui/searchlineedit.cpp
    ui/searchwidget.cpp
    ui/sidebar.cpp
    ui/side_reviews.cpp
    ui/snapshottaker.cpp
    ui/thumbnaillist.cpp
    ui/toc.cpp
    ui/tocmodel.cpp
    ui/toolaction.cpp
    ui/videowidget.cpp
    ui/layers.cpp
    ui/signatureguiutils.cpp
 )
 
 if (Qt5TextToSpeech_FOUND)
    set(okularpart_SRCS ${okularpart_SRCS}
       ui/tts.cpp)
 endif()
 
 ki18n_wrap_ui(okularpart_SRCS
    conf/dlgaccessibilitybase.ui
    conf/dlgeditorbase.ui
    conf/dlggeneralbase.ui
    conf/dlgannotationsbase.ui
    conf/dlgperformancebase.ui
    conf/dlgpresentationbase.ui
 )
 
 kconfig_add_kcfg_files(okularpart_SRCS conf/settings.kcfgc)
 
 add_library(okularpart SHARED ${okularpart_SRCS})
 generate_export_header(okularpart BASE_NAME okularpart)
 
 target_link_libraries(okularpart okularcore
     ${MATH_LIB}
     Qt5::Svg
     Phonon::phonon4qt5
     KF5::Archive
     KF5::Bookmarks
     KF5::I18n
     KF5::IconThemes
     KF5::ItemViews
     KF5::KIOCore
     KF5::KIOFileWidgets
     KF5::KIOWidgets
     KF5::Parts
     KF5::Solid
     KF5::WindowSystem
 )
 
 if(KF5Wallet_FOUND)
     target_link_libraries(okularpart KF5::Wallet)
 endif()
 
 if (KDEExperimentalPurpose_FOUND)
     target_link_libraries(okularpart KDEExperimental::PurposeWidgets)
 endif()
 
 set_target_properties(okularpart PROPERTIES PREFIX "")
 
 if (Qt5TextToSpeech_FOUND)
    target_link_libraries(okularpart Qt5::TextToSpeech)
 endif()
 install(TARGETS okularpart DESTINATION ${KDE_INSTALL_PLUGINDIR})
 
 
 ########### install files ###############
 
 install(FILES okular.upd DESTINATION ${KDE_INSTALL_DATADIR}/kconf_update)
 
 install( FILES okular_part.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
 install( FILES part.rc part-viewermode.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/okular )
 
 install( FILES okular.categories DESTINATION ${KDE_INSTALL_CONFDIR} )
 
 ########### cmake files #################
 
 set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/Okular5")
 configure_package_config_file(
   "${CMAKE_CURRENT_SOURCE_DIR}/Okular5Config.cmake.in"
   "${CMAKE_CURRENT_BINARY_DIR}/Okular5Config.cmake"
   INSTALL_DESTINATION  ${CMAKECONFIG_INSTALL_DIR}
   PATH_VARS  INCLUDE_INSTALL_DIR CMAKE_INSTALL_PREFIX
 )
 
 install(FILES
   "${CMAKE_CURRENT_BINARY_DIR}/Okular5Config.cmake"
   "${CMAKE_CURRENT_BINARY_DIR}/Okular5ConfigVersion.cmake"
   DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
   COMPONENT Devel
 )
 
 install(EXPORT Okular5Targets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE Okular5Targets.cmake NAMESPACE Okular::)
 
 ########### summary #################
 
 feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
 
diff --git a/ui/certificateviewer.cpp b/ui/certificateviewer.cpp
new file mode 100644
index 000000000..9636b0080
--- /dev/null
+++ b/ui/certificateviewer.cpp
@@ -0,0 +1,217 @@
+/***************************************************************************
+ *   Copyright (C) 2018 by Chinmoy Ranjan Pradhan <chinmoyrp65@gmail.com>  *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ ***************************************************************************/
+
+#include "certificateviewer.h"
+
+#include <KMessageBox>
+#include <KLocalizedString>
+#include <KColumnResizer>
+
+#include <QLabel>
+#include <QTextEdit>
+#include <QTreeView>
+#include <QGroupBox>
+#include <QFormLayout>
+#include <QPushButton>
+#include <QVBoxLayout>
+#include <QFileDialog>
+#include <QDialogButtonBox>
+#include <QCryptographicHash>
+
+#include "signatureguiutils.h"
+
+CertificateModel::CertificateModel( Okular::CertificateInfo *certInfo, QObject * parent )
+  : QAbstractTableModel( parent ), m_certificateInfo( certInfo )
+{
+    m_certificateProperties.append( qMakePair( i18n("Version"), i18n("V%1", QString::number( m_certificateInfo->version() )) ) );
+    m_certificateProperties.append( qMakePair( i18n("Serial Number"), m_certificateInfo->serialNumber().toHex(' ') ) );
+    m_certificateProperties.append( qMakePair( i18n("Issuer"), m_certificateInfo->issuerInfo(Okular::CertificateInfo::DistinguishedName) ) );
+    m_certificateProperties.append( qMakePair( i18n("Issued On"), m_certificateInfo->validityStart().toString( QStringLiteral("MMM dd yyyy hh:mm:ss") ) ) );
+    m_certificateProperties.append( qMakePair( i18n("Expires On"), m_certificateInfo->validityEnd().toString( QStringLiteral("MMM dd yyyy hh:mm:ss") ) ) );
+    m_certificateProperties.append( qMakePair( i18n("Subject"), m_certificateInfo->subjectInfo(Okular::CertificateInfo::DistinguishedName) ) );
+    m_certificateProperties.append( qMakePair( i18n("Public Key"), i18n("%1 (%2 bits)", SignatureGuiUtils::getReadablePublicKeyType( m_certificateInfo->publicKeyType() ),
+                                                                        m_certificateInfo->publicKeyStrength()) ) );
+    m_certificateProperties.append( qMakePair( i18n("Key Usage"), SignatureGuiUtils::getReadableKeyUsage( m_certificateInfo->keyUsageExtensions() ) ) );
+}
+
+
+int CertificateModel::columnCount( const QModelIndex & ) const
+{
+    return 2;
+}
+
+int CertificateModel::rowCount( const QModelIndex & ) const
+{
+    return m_certificateProperties.size();
+}
+
+QVariant CertificateModel::data( const QModelIndex &index, int role ) const
+{
+    int row = index.row();
+    if ( !index.isValid() || row < 0 || row >= m_certificateProperties.count() )
+        return QVariant();
+
+    switch ( role )
+    {
+        case Qt::DisplayRole:
+        case Qt::ToolTipRole:
+        switch ( index.column() )
+        {
+            case 0:
+                return m_certificateProperties[row].first;
+            case 1:
+                return m_certificateProperties[row].second;
+            default:
+                return QString();
+        }
+        case PropertyKeyRole:
+            return m_certificateProperties[row].first;
+        case PropertyValueRole:
+            return m_certificateProperties[row].second;
+        case PublicKeyRole:
+            return QString( m_certificateInfo->publicKey().toHex(' ') );
+    }
+
+    return QVariant();
+}
+
+QVariant CertificateModel::headerData( int section, Qt::Orientation orientation, int role ) const
+{
+    if ( role == Qt::TextAlignmentRole )
+        return QVariant( Qt::AlignLeft );
+
+    if ( orientation != Qt::Horizontal || role != Qt::DisplayRole)
+        return QVariant();
+
+    switch ( section )
+    {
+        case 0:
+            return i18n("Property");
+        case 1:
+            return i18n("Value");
+        default:
+            return QVariant();
+    }
+}
+
+CertificateViewer::CertificateViewer( Okular::CertificateInfo *certInfo, QWidget *parent )
+    : KPageDialog( parent ), m_certificateInfo( certInfo )
+{
+    setModal( true );
+    setMinimumSize( QSize( 500, 500 ));
+    setFaceType( Tabbed );
+    setWindowTitle( i18n("Certificate Viewer") );
+    setStandardButtons( QDialogButtonBox::Close );
+
+    auto exportBtn = new QPushButton( i18n("Export...") );
+    connect( exportBtn, &QPushButton::clicked, this, &CertificateViewer::exportCertificate );
+    addActionButton( exportBtn );
+
+    // General tab
+    auto generalPage = new QFrame( this );
+    addPage( generalPage, i18n("General") );
+
+    auto issuerBox = new QGroupBox( i18n("Issued By"), generalPage );
+    auto issuerFormLayout = new QFormLayout( issuerBox );
+    issuerFormLayout->setLabelAlignment( Qt::AlignLeft );
+    issuerFormLayout->addRow( i18n("Common Name(CN)"), new QLabel( m_certificateInfo->issuerInfo( Okular::CertificateInfo::CommonName ) ) );
+    issuerFormLayout->addRow( i18n("EMail"), new QLabel( m_certificateInfo->issuerInfo( Okular::CertificateInfo::EmailAddress ) ) );
+    issuerFormLayout->addRow( i18n("Organization(O)"), new QLabel( m_certificateInfo->issuerInfo( Okular::CertificateInfo::Organization ) ) );
+
+    auto subjectBox = new QGroupBox( i18n("Issued To"), generalPage );
+    auto subjectFormLayout = new QFormLayout( subjectBox );
+    subjectFormLayout->setLabelAlignment( Qt::AlignLeft );
+    subjectFormLayout->addRow( i18n("Common Name(CN)"), new QLabel( m_certificateInfo->subjectInfo( Okular::CertificateInfo::CommonName ) ) );
+    subjectFormLayout->addRow( i18n("EMail"), new QLabel( m_certificateInfo->subjectInfo( Okular::CertificateInfo::EmailAddress ) ) );
+    subjectFormLayout->addRow( i18n("Organization(O)"), new QLabel( m_certificateInfo->subjectInfo( Okular::CertificateInfo::Organization ) ) );
+
+    auto validityBox = new QGroupBox( i18n("Validity"), generalPage );
+    auto validityFormLayout = new QFormLayout( validityBox );
+    validityFormLayout->setLabelAlignment( Qt::AlignLeft );
+    validityFormLayout->addRow( i18n("Issued On"), new QLabel( m_certificateInfo->validityStart().toString( QStringLiteral("MMM dd yyyy hh:mm:ss") ) ) );
+    validityFormLayout->addRow( i18n("Expires On"), new QLabel( m_certificateInfo->validityEnd().toString( QStringLiteral("MMM dd yyyy hh:mm:ss") ) ) );
+
+    auto fingerprintBox = new QGroupBox( i18n("Fingerprints"), generalPage );
+    auto fingerprintFormLayout = new QFormLayout( fingerprintBox );
+    fingerprintFormLayout->setLabelAlignment( Qt::AlignLeft );
+    QByteArray certData = m_certificateInfo->certificateData();
+    auto sha1Label = new QLabel( QString( QCryptographicHash::hash( certData, QCryptographicHash::Sha1 ).toHex(' ') ) );
+    sha1Label->setWordWrap( true );
+    auto sha256Label = new QLabel( QString( QCryptographicHash::hash( certData, QCryptographicHash::Sha256 ).toHex(' ') ) );
+    sha256Label->setWordWrap( true );
+    fingerprintFormLayout->addRow( i18n("SHA-1 Fingerprint"), sha1Label );
+    fingerprintFormLayout->addRow( i18n("SHA-256 Fingerprint"), sha256Label );
+
+    auto generalPageLayout = new QVBoxLayout( generalPage );
+    generalPageLayout->addWidget( issuerBox );
+    generalPageLayout->addWidget( subjectBox );
+    generalPageLayout->addWidget( validityBox );
+    generalPageLayout->addWidget( fingerprintBox );
+
+    //force column 1 to have same width
+    auto resizer = new KColumnResizer( this );
+    resizer->addWidgetsFromLayout( issuerBox->layout(), 0 );
+    resizer->addWidgetsFromLayout( subjectBox->layout(), 0 );
+    resizer->addWidgetsFromLayout( validityBox->layout(), 0 );
+    resizer->addWidgetsFromLayout( fingerprintBox->layout(), 0 );
+
+    // Details tab
+    auto detailsFrame = new QFrame( this );
+    addPage( detailsFrame, i18n("Details") );
+    auto certDataLabel = new QLabel( i18n("Certificate Data:") );
+    auto certTree = new QTreeView( this );
+    certTree->setIndentation( 0 );
+    m_certificateModel = new CertificateModel( m_certificateInfo, this );
+    certTree->setModel( m_certificateModel );
+    //QItemSelectionModel::currentChanged because QTreeView::activated only works for mouse.
+    connect( certTree->selectionModel(), &QItemSelectionModel::currentChanged, this, &CertificateViewer::updateText );
+    m_propertyText = new QTextEdit( this );
+    m_propertyText->setReadOnly( true );
+
+    auto detailsPageLayout = new QVBoxLayout( detailsFrame );
+    detailsPageLayout->addWidget( certDataLabel );
+    detailsPageLayout->addWidget( certTree );
+    detailsPageLayout->addWidget( m_propertyText );
+}
+
+void CertificateViewer::updateText( const QModelIndex &index )
+{
+    QString key = m_certificateModel->data( index, CertificateModel::PropertyKeyRole ).toString();
+    if ( key == QLatin1String("Public Key") )
+        m_propertyText->setText( m_certificateModel->data( index, CertificateModel::PublicKeyRole ).toString() );
+    else
+    {
+        const QString propertyValue = m_certificateModel->data( index, CertificateModel::PropertyValueRole ).toString();
+        QString textToView;
+        foreach ( auto c, propertyValue )
+        {
+            if ( c == ',' )
+                textToView += '\n';
+            else
+                textToView += c;
+        }
+        m_propertyText->setText( textToView );
+    }
+}
+
+void CertificateViewer::exportCertificate()
+{
+    const QString caption = i18n("Where do you want to save this certificate?");
+    const QString path = QFileDialog::getSaveFileName( this, caption, QStringLiteral("Certificate.cer"), i18n("Certificate File (*.cer)") );
+    if ( !path.isEmpty() )
+    {
+        QFile targetFile( path );
+        targetFile.open( QIODevice::WriteOnly );
+        if ( targetFile.write( m_certificateInfo->certificateData() ) == -1 )
+        {
+            KMessageBox::error( this, i18n("Unable to export certificate!") );
+        }
+        targetFile.close();
+    }
+}
diff --git a/ui/certificateviewer.h b/ui/certificateviewer.h
new file mode 100644
index 000000000..b29bf4951
--- /dev/null
+++ b/ui/certificateviewer.h
@@ -0,0 +1,65 @@
+/***************************************************************************
+ *   Copyright (C) 2018 by Chinmoy Ranjan Pradhan <chinmoyrp65@gmail.com>  *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ ***************************************************************************/
+
+#ifndef OKULAR_CERTIFICATEVIEWER_H
+#define OKULAR_CERTIFICATEVIEWER_H
+
+#include <QVector>
+#include <QAbstractTableModel>
+#include <KPageDialog>
+
+#include "core/signatureutils.h"
+
+class QTextEdit;
+
+namespace Okular {
+    class CertificateInfo;
+}
+
+class CertificateModel : public QAbstractTableModel
+{
+    Q_OBJECT
+
+    public:
+        explicit CertificateModel( Okular::CertificateInfo *certInfo, QObject * parent = nullptr );
+
+        enum {
+            PropertyKeyRole = Qt::UserRole,
+            PropertyValueRole,
+            PublicKeyRole
+        };
+
+        int columnCount( const QModelIndex &parent = QModelIndex() ) const override;
+        int rowCount( const QModelIndex &parent = QModelIndex() ) const override;
+        QVariant data( const QModelIndex &index, int role = Qt::DisplayRole ) const override;
+        QVariant headerData( int section, Qt::Orientation orientation, int role ) const override;
+
+    private:
+        QVector< QPair<QString, QString> > m_certificateProperties;
+        Okular::CertificateInfo *m_certificateInfo;
+};
+
+class CertificateViewer : public KPageDialog
+{
+    Q_OBJECT
+
+    public:
+        CertificateViewer( Okular::CertificateInfo *certInfo, QWidget *parent );
+
+    private Q_SLOTS:
+        void updateText( const QModelIndex &index );
+        void exportCertificate();
+
+    private:
+        QTextEdit *m_propertyText;
+        CertificateModel  *m_certificateModel;
+        Okular::CertificateInfo *m_certificateInfo;
+};
+
+#endif