Merge pull request #36 from saturneric/developv2.0.4

v2.0.4

1 files changed, 7 insertions, 2 deletions

diff --git a/src/ui/main_window/MainWindowUI.cpp b/src/ui/main_window/MainWindowUI.cpp
index 0c557d16..cb7962f7 100644
--- a/src/ui/main_window/MainWindowUI.cpp
+++ b/src/ui/main_window/MainWindowUI.cpp
@@ -258,7 +258,7 @@ void MainWindow::createActions() {
   /* Popup-Menu-Action for KeyList
    */
   appendSelectedKeysAct =
-      new QAction(_("Append Selected Key(s) To Text"), this);
+      new QAction(_("Append Public Key To Text Editor"), this);
   appendSelectedKeysAct->setToolTip(
       _("Append The Selected Keys To Text in Editor"));
   connect(appendSelectedKeysAct, SIGNAL(triggered()), this,
@@ -297,7 +297,7 @@ void MainWindow::createActions() {
   connect(addPgpHeaderAct, SIGNAL(triggered()), this, SLOT(slotAddPgpHeader()));
 
 #ifdef SMTP_SUPPORT
-  sendMailAct = new QAction(_("Send An Email"), this);
+  sendMailAct = new QAction(_("New Message"), this);
   sendMailAct->setIcon(QIcon(":email.png"));
   connect(sendMailAct, &QAction::triggered, this, [=]() {
     auto* dialog = new SendMailDialog({}, this);
@@ -421,6 +421,11 @@ void MainWindow::createToolBars() {
   specialEditToolBar->hide();
   viewMenu->addAction(specialEditToolBar->toggleViewAction());
 
+  emailToolBar = addToolBar(_("Email"));
+  emailToolBar->setObjectName("emailToolBar");
+  emailToolBar->addAction(sendMailAct);
+  viewMenu->addAction(emailToolBar->toggleViewAction());
+
   // Add dropdown menu for key import to keytoolbar
   importButton = new QToolButton();
   importButton->setMenu(importKeyMenu);