diff --git a/main.go b/main.go
index b05fa6a..2c03d65 100644
--- a/main.go
+++ b/main.go
@@ -38,12 +38,12 @@ func setupLogging() {
 func printWelcomeMessage() {
 	// Print ascii art of "Kordophone"
 	fmt.Println(`
-_  __           _          _                 
+ _  __           _          _                 
 | |/ /___ _ _ __| |___ _ __| |_  ___ _ _  ___ 
 | ' </ _ \ '_/ _' / _ \ '_ \ ' \/ _ \ ' \/ -_)
 |_|\_\___/_| \__,_\___/ .__/_||_\___/_||_\___|
                       |_|                     
-	`)
+    `)
 }
 
 func main() {
diff --git a/model/conversation.go b/model/conversation.go
index b10ae5a..a23531b 100644
--- a/model/conversation.go
+++ b/model/conversation.go
@@ -13,6 +13,7 @@ type Conversation struct {
 	DisplayName        *string   `json:"displayName,omitempty"` // Optional
 	UnreadCount        int       `json:"unreadCount"`
 	LastMessagePreview string    `json:"lastMessagePreview"`
+	LastMessage        Message   `json:"lastMessage"`
 	Guid               string    `json:"guid"`
 }
 
diff --git a/model/message.go b/model/message.go
index 526fcf6..c173abd 100644
--- a/model/message.go
+++ b/model/message.go
@@ -9,11 +9,11 @@ import (
 type Message struct {
 	Text   string    `json:"text"`
 	Guid   string    `json:"guid"`
-	Sender *string   `json:"sender"` // Optional: nil means from "me"
+	Sender *string   `json:"sender,omitempty"` // Optional: nil means from "me"
 	Date   time.Time `json:"date"`
 
 	// Map of attachment GUID to attachment metadata
-	Attachments *map[string]AttributionInfo `json:"attachmentMetadata"` // Optional
+	Attachments *map[string]AttributionInfo `json:"attachmentMetadata,omitempty"` // Optional
 }
 
 type AttributionInfo struct {
diff --git a/server/server.go b/server/server.go
index 77cb95c..8da05c9 100644
--- a/server/server.go
+++ b/server/server.go
@@ -9,7 +9,7 @@ import (
 	"github.com/rs/zerolog/log"
 )
 
-const VERSION = "Kordophone-2.0"
+const VERSION = "Kordophone-2.6"
 
 const (
 	AUTH_USERNAME = "test"
@@ -118,7 +118,8 @@ func (s *Server) PopulateWithTestData() {
 			}
 		}
 
-		// Update last message preview
+		// Update last message
+		convo.LastMessage = lastMessage
 		convo.LastMessagePreview = lastMessage.Text
 	}