diff --git a/cockatrice/src/dlg_settings.cpp b/cockatrice/src/dlg_settings.cpp
index 2e061046..723e1128 100644
--- a/cockatrice/src/dlg_settings.cpp
+++ b/cockatrice/src/dlg_settings.cpp
@@ -690,6 +690,9 @@ MessagesSettingsPage::MessagesSettingsPage()
     aAdd = new QAction(this);
     aAdd->setIcon(QPixmap("theme:icons/increment"));
     connect(aAdd, SIGNAL(triggered()), this, SLOT(actAdd()));
+    aEdit = new QAction(this);
+    aEdit->setIcon(QPixmap("theme:icons/pencil"));
+    connect(aEdit, SIGNAL(triggered()), this, SLOT(actEdit()));
     aRemove = new QAction(this);
     aRemove->setIcon(QPixmap("theme:icons/decrement"));
     connect(aRemove, SIGNAL(triggered()), this, SLOT(actRemove()));
@@ -698,6 +701,8 @@ MessagesSettingsPage::MessagesSettingsPage()
     messageToolBar->setOrientation(Qt::Vertical);
     messageToolBar->addAction(aAdd);
     messageToolBar->addAction(aRemove);
+    messageToolBar->addAction(aEdit);
+    messageToolBar->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding);
 
     auto *messageListLayout = new QHBoxLayout;
     messageListLayout->addWidget(messageToolBar);
@@ -778,6 +783,19 @@ void MessagesSettingsPage::actAdd()
     }
 }
 
+void MessagesSettingsPage::actEdit()
+{
+    if (messageList->currentItem()) {
+        QString oldText = messageList->currentItem()->text();
+        bool ok;
+        QString msg = QInputDialog::getText(this, tr("Edit message"), tr("Message:"), QLineEdit::Normal, oldText, &ok);
+        if (ok) {
+            messageList->currentItem()->setText(msg);
+            storeSettings();
+        }
+    }
+}
+
 void MessagesSettingsPage::actRemove()
 {
     if (messageList->currentItem()) {
diff --git a/cockatrice/src/dlg_settings.h b/cockatrice/src/dlg_settings.h
index f65df011..d35add0c 100644
--- a/cockatrice/src/dlg_settings.h
+++ b/cockatrice/src/dlg_settings.h
@@ -171,6 +171,7 @@ public:
 
 private slots:
     void actAdd();
+    void actEdit();
     void actRemove();
     void updateColor(const QString &value);
     void updateHighlightColor(const QString &value);
@@ -180,6 +181,7 @@ private slots:
 private:
     QListWidget *messageList;
     QAction *aAdd;
+    QAction *aEdit;
     QAction *aRemove;
     QCheckBox chatMentionCheckBox;
     QCheckBox chatMentionCompleterCheckbox;