2 files changed, 17 insertions, 3 deletions

diff --git a/framework/src/domain/composercontroller.cpp b/framework/src/domain/composercontroller.cpp
index 31cb896d..9e006af4 100644
--- a/framework/src/domain/composercontroller.cpp
+++ b/framework/src/domain/composercontroller.cpp
@@ -97,6 +97,7 @@ ComposerController::ComposerController()
                                         {MimeTypeRole, "mimetype"},
                                         {DescriptionRole, "description"},
                                         {IconNameRole, "iconName"},
+                                        {UrlRole, "url"},
                                         {InlineRole, "inline"}});
     updateSaveAsDraftAction();
     // mSendAction->monitorProperty<To>();
@@ -218,13 +219,25 @@ void ComposerController::addAttachment(const QUrl &url)
         item->setData(fileInfo.fileName(), FilenameRole);
         item->setData(false, InlineRole);
         item->setData(mimeType.iconName(), IconNameRole);
+        item->setData(url, UrlRole);
         item->setData(data, ContentRole);
         mAttachmentModel->appendRow(item);
     }
 }
 
-void ComposerController::removeAttachment(const QString &s)
+void ComposerController::removeAttachment(const QUrl &url)
 {
+    auto root = mAttachmentModel->invisibleRootItem();
+    if (root->hasChildren()) {
+        for (int row = 0; row < root->rowCount(); row++) {
+            auto item = root->child(row, 0);
+            const auto url = item->data(UrlRole).toUrl();
+            if (url == item->data(UrlRole).toUrl()) {
+                root->removeRow(row);
+                return;
+            }
+        }
+    }
 }
 
 Completer *ComposerController::recipientCompleter() const
diff --git a/framework/src/domain/composercontroller.h b/framework/src/domain/composercontroller.h
index de154b66..b2486cee 100644
--- a/framework/src/domain/composercontroller.h
+++ b/framework/src/domain/composercontroller.h
@@ -92,7 +92,7 @@ public:
     Q_INVOKABLE void addBcc(const QString &);
     Q_INVOKABLE void removeBcc(const QString &);
     Q_INVOKABLE void addAttachment(const QUrl &);
-    Q_INVOKABLE void removeAttachment(const QString &);
+    Q_INVOKABLE void removeAttachment(const QUrl &);
 
 public slots:
     virtual void clear() Q_DECL_OVERRIDE;
@@ -109,7 +109,8 @@ private:
         MimeTypeRole,
         DescriptionRole,
         InlineRole,
-        IconNameRole
+        IconNameRole,
+        UrlRole
     };
 
     void recordForAutocompletion(const QByteArray &addrSpec, const QByteArray &displayName);