diff --git a/src/controls/AboutPage.qml b/src/controls/AboutPage.qml
index 93ca1b26..973665fc 100644
--- a/src/controls/AboutPage.qml
+++ b/src/controls/AboutPage.qml
@@ -1,221 +1,237 @@
 /*
  *  SPDX-FileCopyrightText: 2018 Aleix Pol Gonzalez <aleixpol@blue-systems.com>
  *
  *  SPDX-License-Identifier: LGPL-2.0-or-later
  */
 
 import QtQuick 2.1
 import QtQuick.Controls 2.4 as QQC2
 import QtQuick.Layouts 1.3
 import org.kde.kirigami 2.6
 
 /**
  * An about page that is ready to integrate in a kirigami app
  *
  * Allows to have a page that will show the copyright notice of the application
  * together with the contributors and some information of which platform it's
  * running on.
  *
  * @since 5.52
  * @since org.kde.kirigami 2.6
  */
 ScrollablePage
 {
     id: page
     /**
      * An object with the same shape of KAboutData
      *
      * For example:
      * @code
      * aboutData: {
         "displayName" : "KirigamiApp",
         "productName" : "kirigami/app",
         "componentName" : "kirigamiapp",
         "shortDescription" : "A Kirigami example",
         "homepage" : "",
         "bugAddress" : "submit@bugs.kde.org",
         "version" : "5.14.80",
         "otherText" : "",
         "authors" : [
             {
                 "name" : "...",
                 "task" : "",
                 "emailAddress" : "somebody@kde.org",
                 "webAddress" : "",
                 "ocsUsername" : ""
             }
         ],
         "credits" : [],
         "translators" : [],
         "licenses" : [
             {
                 "name" : "GPL v2",
                 "text" : "long, boring, license text",
                 "spdx" : "GPL-2.0"
             }
         ],
         "copyrightStatement" : "© 2010-2018 Plasma Development Team",
         "desktopFileName" : "org.kde.kirigamiapp"
         }
         @endcode
      *
      * @see KAboutData
      */
     property var aboutData
 
     title: qsTr("About")
 
     Component {
         id: licencePage
         ScrollablePage {
             property alias text: content.text
             QQC2.TextArea {
                 id: content
                 readOnly: true
             }
         }
     }
 
     Component {
         id: personDelegate
 
         RowLayout {
             height: implicitHeight + (Units.smallSpacing * 2)
 
             spacing: Units.smallSpacing * 2
             Icon {
                 width: Units.iconSizes.smallMedium
                 height: width
                 source: "user"
             }
             QQC2.Label {
-                text: modelData.emailAddress ? qsTr("%1 <%2>").arg(modelData.name).arg(modelData.emailAddress) : modelData.name
+                text: modelData.name
+            }
+            Row {
+                // Group action buttons together
+                spacing: 0
+                QQC2.ToolButton {
+                    visible: modelData.emailAddress
+                    width: height
+                    icon.name: "mail-sent"
+                    onClicked: Qt.openUrlExternally("mailto:%1".arg(modelData.emailAddress))
+                }
+                QQC2.ToolButton {
+                    visible: modelData.webAddress
+                    width: height
+                    icon.name: "globe"
+                    onClicked: Qt.openUrlExternally(modelData.webAddress)
+                }
             }
         }
     }
 
     FormLayout {
         id: form
 
         GridLayout {
             columns: 2
             Layout.fillWidth: true
 
             Icon {
                 Layout.rowSpan: 2
                 Layout.preferredHeight: Units.iconSizes.huge
                 Layout.preferredWidth: height
                 Layout.maximumWidth: page.width / 3;
                 Layout.rightMargin: Units.largeSpacing
                 source: Settings.applicationWindowIcon || page.aboutData.programLogo || page.aboutData.programIconName || page.aboutData.componentName
             }
             Heading {
                 Layout.fillWidth: true
                 text: page.aboutData.displayName + " " + page.aboutData.version
             }
             Heading {
                 Layout.fillWidth: true
                 level: 2
                 wrapMode: Text.WordWrap
                 text: page.aboutData.shortDescription
             }
         }
 
         Separator {
             Layout.fillWidth: true
         }
 
         Heading {
             FormData.isSection: true
             text: qsTr("Copyright")
         }
         QQC2.Label {
             Layout.leftMargin: Units.gridUnit
             text: aboutData.otherText
             visible: text.length > 0
         }
         QQC2.Label {
             Layout.leftMargin: Units.gridUnit
             text: aboutData.copyrightStatement
             visible: text.length > 0
         }
         UrlButton {
             Layout.leftMargin: Units.gridUnit
             url: aboutData.homepage
             visible: url.length > 0
         }
 
         Component {
             id: licenseLinkButton
 
             RowLayout {
                 Layout.leftMargin: Units.smallSpacing
                 QQC2.Label { text: qsTr("License:") }
                 LinkButton {
                     text: modelData.name
                     onClicked: applicationWindow().pageStack.push(licencePage, { text: modelData.text, title: modelData.name } )
                 }
             }
         }
 
         Component {
             id: licenseTextItem
 
             RowLayout {
                 Layout.leftMargin: Units.smallSpacing
                 QQC2.Label { text: qsTr("License: %1").arg(modelData.name) }
             }
         }
 
         Repeater {
             model: aboutData.licenses
             delegate: applicationWindow().pageStack ? licenseLinkButton : licenseTextItem
         }
 
         Heading {
             FormData.isSection: visible
             text: qsTr("Libraries in use")
             visible: Settings.information
         }
         Repeater {
             model: Settings.information
             delegate: QQC2.Label {
                 Layout.leftMargin: Units.gridUnit
                 id: libraries
                 text: modelData
             }
         }
         Heading {
             Layout.fillWidth: true
             FormData.isSection: visible
             text: qsTr("Authors")
             visible: aboutData.authors.length > 0
         }
         Repeater {
             model: aboutData.authors
             delegate: personDelegate
         }
         Heading {
             height: visible ? implicitHeight : 0
             FormData.isSection: visible
             text: qsTr("Credits")
             visible: repCredits.count > 0
         }
         Repeater {
             id: repCredits
             model: aboutData.credits
             delegate: personDelegate
         }
         Heading {
             height: visible ? implicitHeight : 0
             FormData.isSection: visible
             text: qsTr("Translators")
             visible: repTranslators.count > 0
         }
         Repeater {
             id: repTranslators
             model: aboutData.translators
             delegate: personDelegate
         }
     }
 }