diff --git a/data/channel.go b/data/channel.go
index 36b5ff7..df9083b 100644
--- a/data/channel.go
+++ b/data/channel.go
@@ -14,7 +14,6 @@ type Channel struct {
 	PublicReplies bool
 	Edition       int
 	Description   string
-	Avatar        []byte
 }
 
 func (c *Channel) Encode() ([]byte, error) {
@@ -27,19 +26,12 @@ func (c *Channel) Encode() ([]byte, error) {
 	return buf.Bytes(), nil
 }
 
-func (c *Channel) Decode(data []byte) (*Channel, error) {
+func (c *Channel) Decode(data []byte) error {
 	buf := bytes.NewBuffer(data)
 	dec := gob.NewDecoder(buf)
 	err := dec.Decode(&c)
 	if err != nil {
-		return nil, err
+		return err
 	}
-	return c, nil
-}
-
-func DecodeChannel(c *Channel, data []byte) error {
-	buf := bytes.NewBuffer(data)
-	dec := gob.NewDecoder(buf)
-	err := dec.Decode(&c)
-	return err
+	return nil
 }
diff --git a/data/database.go b/data/database.go
index d2026c4..2b3b6d5 100644
--- a/data/database.go
+++ b/data/database.go
@@ -21,7 +21,7 @@ func InitDB() error {
 		if err != nil {
 			return err
 		}
-		_, err = tx.CreateBucketIfNotExists([]byte("bodykeys"))
+		_, err = tx.CreateBucketIfNotExists([]byte("messages"))
 		if err != nil {
 			return err
 		}
@@ -52,7 +52,7 @@ func ReadChannel(key []byte) (*Channel, error) {
 			c = nil
 			return nil
 		}
-		err := DecodeChannel(c, v)
+		err := c.Decode(v)
 		if err != nil {
 			return err
 		}
@@ -87,7 +87,7 @@ func ReadMessage(key []byte) (*Message, error) {
 			m = nil
 			return nil
 		}
-		err := DecodeMessage(m, v)
+		err := m.Decode(v)
 		if err != nil {
 			return err
 		}
diff --git a/data/message.go b/data/message.go
index 020faed..0a88fcc 100644
--- a/data/message.go
+++ b/data/message.go
@@ -3,6 +3,8 @@ package data
 import (
 	"bytes"
 	"encoding/gob"
+
+	"github.com/kpetku/go-syndie/syndieutil"
 )
 
 type Message struct {
@@ -11,6 +13,9 @@ type Message struct {
 	Subject       string
 	Body          string
 	TargetChannel string
+	Avatar        []byte
+	Author        string
+	Raw           *syndieutil.Message
 }
 
 func (m *Message) Encode() ([]byte, error) {
@@ -23,19 +28,12 @@ func (m *Message) Encode() ([]byte, error) {
 	return buf.Bytes(), nil
 }
 
-func (m *Message) Decode(data []byte) (*Message, error) {
+func (m *Message) Decode(data []byte) error {
 	buf := bytes.NewBuffer(data)
 	dec := gob.NewDecoder(buf)
 	err := dec.Decode(&m)
 	if err != nil {
-		return nil, err
+		return err
 	}
-	return m, nil
-}
-
-func DecodeMessage(m *Message, data []byte) error {
-	buf := bytes.NewBuffer(data)
-	dec := gob.NewDecoder(buf)
-	err := dec.Decode(&m)
-	return err
+	return nil
 }