diff --git a/client/Client.go b/client/Client.go
index a65ef5d..2536c44 100644
--- a/client/Client.go
+++ b/client/Client.go
@@ -2,9 +2,11 @@
 package client
 
 import (
+	"time"
+
 	"github.com/golang/protobuf/proto"
+	"github.com/status-im/dasy/protobuf"
 	mvds "github.com/status-im/mvds/node"
-	"github.com/status-im/mvds/protobuf"
 	"github.com/status-im/mvds/state"
 )
 
@@ -43,11 +45,20 @@ func (c *Client) Ack(chat Chat, messageID []byte) {
 
 // Post sends a message to a chat.
 func (c *Client) Post(chat Chat, body []byte) {
-
+	c.send(chat, protobuf.Message_POST, body) // @todo
 }
 
-func (c *Client) send(chat Chat, message *protobuf.Message) error {
-	buf, err := proto.Marshal(message)
+func (c *Client) send(chat Chat, t protobuf.Message_MessageType, body []byte) error {
+	msg := &protobuf.Message{
+		Clock: 0,
+		Timestamp: uint64(time.Now().Unix()), // @todo we may be able to take this from mvds
+		MessageType: protobuf.Message_MessageType(t),
+		Body: body,
+	}
+
+	// @todo sign
+
+	buf, err := proto.Marshal(msg)
 	if err != nil {
 		return  err
 	}
diff --git a/protobuf/message.pb.go b/protobuf/message.pb.go
index 0591c08..fe2c373 100644
--- a/protobuf/message.pb.go
+++ b/protobuf/message.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: protobuf/message.proto
 
-package message
+package protobuf
 
 import (
 	fmt "fmt"
@@ -60,9 +60,9 @@ func (Message_MessageType) EnumDescriptor() ([]byte, []int) {
 type Message struct {
 	Clock                uint64              `protobuf:"varint,1,opt,name=clock,proto3" json:"clock,omitempty"`
 	Timestamp            uint64              `protobuf:"varint,2,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
-	MessageType          Message_MessageType `protobuf:"varint,3,opt,name=message_type,json=messageType,proto3,enum=Message_MessageType" json:"message_type,omitempty"`
-	Body                 [][]byte            `protobuf:"bytes,4,rep,name=body,proto3" json:"body,omitempty"`
-	Signature            [][]byte            `protobuf:"bytes,5,rep,name=signature,proto3" json:"signature,omitempty"`
+	MessageType          Message_MessageType `protobuf:"varint,3,opt,name=message_type,json=messageType,proto3,enum=mvds.Message_MessageType" json:"message_type,omitempty"`
+	Body                 []byte              `protobuf:"bytes,4,opt,name=body,proto3" json:"body,omitempty"`
+	Signature            []byte              `protobuf:"bytes,5,opt,name=signature,proto3" json:"signature,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
 	XXX_unrecognized     []byte              `json:"-"`
 	XXX_sizecache        int32               `json:"-"`
@@ -114,14 +114,14 @@ func (m *Message) GetMessageType() Message_MessageType {
 	return Message_INVITE
 }
 
-func (m *Message) GetBody() [][]byte {
+func (m *Message) GetBody() []byte {
 	if m != nil {
 		return m.Body
 	}
 	return nil
 }
 
-func (m *Message) GetSignature() [][]byte {
+func (m *Message) GetSignature() []byte {
 	if m != nil {
 		return m.Signature
 	}
@@ -129,27 +129,27 @@ func (m *Message) GetSignature() [][]byte {
 }
 
 func init() {
-	proto.RegisterEnum("Message_MessageType", Message_MessageType_name, Message_MessageType_value)
-	proto.RegisterType((*Message)(nil), "Message")
+	proto.RegisterEnum("mvds.Message_MessageType", Message_MessageType_name, Message_MessageType_value)
+	proto.RegisterType((*Message)(nil), "mvds.Message")
 }
 
 func init() { proto.RegisterFile("protobuf/message.proto", fileDescriptor_8368f5d77b0b9b7b) }
 
 var fileDescriptor_8368f5d77b0b9b7b = []byte{
-	// 225 bytes of a gzipped FileDescriptorProto
+	// 240 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2b, 0x28, 0xca, 0x2f,
-	0xc9, 0x4f, 0x2a, 0x4d, 0xd3, 0xcf, 0x4d, 0x2d, 0x2e, 0x4e, 0x4c, 0x4f, 0xd5, 0x03, 0x0b, 0x28,
-	0x7d, 0x65, 0xe4, 0x62, 0xf7, 0x85, 0x88, 0x08, 0x89, 0x70, 0xb1, 0x26, 0xe7, 0xe4, 0x27, 0x67,
-	0x4b, 0x30, 0x2a, 0x30, 0x6a, 0xb0, 0x04, 0x41, 0x38, 0x42, 0x32, 0x5c, 0x9c, 0x25, 0x99, 0xb9,
-	0xa9, 0xc5, 0x25, 0x89, 0xb9, 0x05, 0x12, 0x4c, 0x60, 0x19, 0x84, 0x80, 0x90, 0x39, 0x17, 0x0f,
-	0xd4, 0xc0, 0xf8, 0x92, 0xca, 0x82, 0x54, 0x09, 0x66, 0x05, 0x46, 0x0d, 0x3e, 0x23, 0x11, 0x3d,
-	0xa8, 0x99, 0x30, 0x3a, 0xa4, 0xb2, 0x20, 0x35, 0x88, 0x3b, 0x17, 0xc1, 0x11, 0x12, 0xe2, 0x62,
-	0x49, 0xca, 0x4f, 0xa9, 0x94, 0x60, 0x51, 0x60, 0xd6, 0xe0, 0x09, 0x02, 0xb3, 0x41, 0x56, 0x15,
-	0x67, 0xa6, 0xe7, 0x25, 0x96, 0x94, 0x16, 0xa5, 0x4a, 0xb0, 0x82, 0x25, 0x10, 0x02, 0x4a, 0xde,
-	0x5c, 0xdc, 0x48, 0xa6, 0x09, 0x71, 0x71, 0xb1, 0x79, 0xfa, 0x85, 0x79, 0x86, 0xb8, 0x0a, 0x30,
-	0x08, 0x71, 0x70, 0xb1, 0x78, 0xf9, 0x7b, 0xfa, 0x09, 0x30, 0x0a, 0x71, 0x72, 0xb1, 0xfa, 0xb8,
-	0x3a, 0x86, 0xb9, 0x0a, 0x30, 0x81, 0x04, 0xbd, 0x3d, 0x9d, 0xbd, 0x05, 0x98, 0x85, 0xd8, 0xb9,
-	0x98, 0x1d, 0x9d, 0xbd, 0x05, 0x58, 0x40, 0x42, 0x01, 0xfe, 0xc1, 0x21, 0x02, 0xac, 0x49, 0x6c,
-	0x60, 0xef, 0x1b, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x3c, 0x96, 0xc5, 0x8a, 0x18, 0x01, 0x00,
-	0x00,
+	0xc9, 0x4f, 0x2a, 0x4d, 0xd3, 0xcf, 0x4d, 0x2d, 0x2e, 0x4e, 0x4c, 0x4f, 0xd5, 0x03, 0x0b, 0x08,
+	0xb1, 0xe4, 0x96, 0xa5, 0x14, 0x2b, 0xfd, 0x62, 0xe4, 0x62, 0xf7, 0x85, 0x88, 0x0b, 0x89, 0x70,
+	0xb1, 0x26, 0xe7, 0xe4, 0x27, 0x67, 0x4b, 0x30, 0x2a, 0x30, 0x6a, 0xb0, 0x04, 0x41, 0x38, 0x42,
+	0x32, 0x5c, 0x9c, 0x25, 0x99, 0xb9, 0xa9, 0xc5, 0x25, 0x89, 0xb9, 0x05, 0x12, 0x4c, 0x60, 0x19,
+	0x84, 0x80, 0x90, 0x0d, 0x17, 0x0f, 0xd4, 0xd8, 0xf8, 0x92, 0xca, 0x82, 0x54, 0x09, 0x66, 0x05,
+	0x46, 0x0d, 0x3e, 0x23, 0x49, 0x3d, 0x90, 0xe1, 0x7a, 0x50, 0x83, 0x61, 0x74, 0x48, 0x65, 0x41,
+	0x6a, 0x10, 0x77, 0x2e, 0x82, 0x23, 0x24, 0xc4, 0xc5, 0x92, 0x94, 0x9f, 0x52, 0x29, 0xc1, 0xa2,
+	0xc0, 0xa8, 0xc1, 0x13, 0x04, 0x66, 0x83, 0xec, 0x2b, 0xce, 0x4c, 0xcf, 0x4b, 0x2c, 0x29, 0x2d,
+	0x4a, 0x95, 0x60, 0x05, 0x4b, 0x20, 0x04, 0x94, 0xbc, 0xb9, 0xb8, 0x91, 0x4c, 0x13, 0xe2, 0xe2,
+	0x62, 0xf3, 0xf4, 0x0b, 0xf3, 0x0c, 0x71, 0x15, 0x60, 0x10, 0xe2, 0xe0, 0x62, 0xf1, 0xf2, 0xf7,
+	0xf4, 0x13, 0x60, 0x14, 0xe2, 0xe4, 0x62, 0xf5, 0x71, 0x75, 0x0c, 0x73, 0x15, 0x60, 0x02, 0x09,
+	0x7a, 0x7b, 0x3a, 0x7b, 0x0b, 0x30, 0x0b, 0xb1, 0x73, 0x31, 0x3b, 0x3a, 0x7b, 0x0b, 0xb0, 0x80,
+	0x84, 0x02, 0xfc, 0x83, 0x43, 0x04, 0x58, 0x9d, 0xb8, 0xa2, 0x38, 0x60, 0x81, 0x93, 0xc4, 0x06,
+	0x66, 0x19, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0xc3, 0x59, 0x25, 0x81, 0x2f, 0x01, 0x00, 0x00,
 }
diff --git a/protobuf/message.proto b/protobuf/message.proto
index bbb80e5..76b589e 100644
--- a/protobuf/message.proto
+++ b/protobuf/message.proto
@@ -1,5 +1,8 @@
 syntax = "proto3";
 
+package mvds;
+option go_package = "protobuf";
+
 message Message {
 
     enum MessageType {
@@ -14,6 +17,6 @@ message Message {
     uint64 clock = 1;
     uint64 timestamp = 2;
     MessageType message_type = 3;
-    repeated bytes body = 4;
-    repeated bytes signature = 5;
+    bytes body = 4;
+    bytes signature = 5;
 }