diff --git a/src/preferences/filetypes/IconView.cpp b/src/preferences/filetypes/IconView.cpp
index b07b60c9bc..0af0616b3e 100644
--- a/src/preferences/filetypes/IconView.cpp
+++ b/src/preferences/filetypes/IconView.cpp
@@ -1131,14 +1131,12 @@ IconView::SetModificationMessage(BMessage* message)
 
 
 status_t
-IconView::Invoke(const BMessage* _message)
+IconView::Invoke(BMessage* message)
 {
-	if (_message == NULL)
+	if (message == NULL)
 		fTarget.SendMessage(kMsgIconInvoked);
-	else {
-		BMessage message(*_message);
-		fTarget.SendMessage(&message);
-	}
+	else 
+		fTarget.SendMessage(message);
 	return B_OK;
 }
 
diff --git a/src/preferences/filetypes/IconView.h b/src/preferences/filetypes/IconView.h
index f65ab1ced0..f321bd9393 100644
--- a/src/preferences/filetypes/IconView.h
+++ b/src/preferences/filetypes/IconView.h
@@ -98,7 +98,7 @@ class IconView : public BControl {
 		void ShowEmptyFrame(bool show);
 		status_t SetTarget(const BMessenger& target);
 		void SetModificationMessage(BMessage* message);
-		status_t Invoke(const BMessage* message = NULL);
+		status_t Invoke(BMessage* message = NULL);
 
 		::Icon* Icon();
 		int32 IconSize() const { return fIconSize; }