diff --git a/controller/message.go b/controller/message.go
index 974ee7e..75b4b5d 100644
--- a/controller/message.go
+++ b/controller/message.go
@@ -250,7 +250,6 @@ func GetMessage(c *gin.Context) {
 }
 
 func SearchMessages(c *gin.Context) {
-	// TODO: improve the search algorithm
 	keyword := c.Query("keyword")
 	messages, err := model.SearchMessages(keyword)
 	if err != nil {
diff --git a/model/message.go b/model/message.go
index 91ad19b..46e3ba4 100644
--- a/model/message.go
+++ b/model/message.go
@@ -47,7 +47,7 @@ func GetMessagesByUserId(userId int, startIdx int, num int) (messages []*Message
 }
 
 func SearchMessages(keyword string) (messages []*Message, err error) {
-	err = DB.Select([]string{"id", "title", "channel", "status"}).Where("id = ? or title LIKE ? or channel = ? or status = ?", keyword, keyword+"%", keyword, keyword).Find(&messages).Error
+	err = DB.Select([]string{"id", "title", "description", "content"}).Where("id = ? or title LIKE ? or description LIKE ? or content LIKE ?", keyword, keyword+"%", keyword+"%", keyword+"%").Find(&messages).Error
 	return messages, err
 }
 
diff --git a/web/src/components/MessagesTable.js b/web/src/components/MessagesTable.js
index aebb350..82965d4 100644
--- a/web/src/components/MessagesTable.js
+++ b/web/src/components/MessagesTable.js
@@ -211,7 +211,7 @@ const MessagesTable = () => {
           icon='search'
           fluid
           iconPosition='left'
-          placeholder='搜索消息的 ID，标题，通道，以及发送状态 ...'
+          placeholder='搜索消息的 ID，标题，描述，以及消息内容 ...'
           value={searchKeyword}
           loading={searching}
           onChange={handleKeywordChange}