3 files changed, 22 insertions, 7 deletions

diff --git a/common/domain/applicationdomaintype.h b/common/domain/applicationdomaintype.h
index 39ce2b9..b377db9 100644
--- a/common/domain/applicationdomaintype.h
+++ b/common/domain/applicationdomaintype.h
@@ -271,10 +271,17 @@ struct SINK_EXPORT Folder : public Entity {
 };
 
 struct SINK_EXPORT Mail : public Entity {
+    struct SINK_EXPORT Contact {
+        QString name;
+        QString emailAddress;
+    };
+
     SINK_ENTITY(Mail);
     SINK_PROPERTY(QString, Uid, uid);
-    SINK_EXTRACTED_PROPERTY(QString, Sender, sender);
-    SINK_EXTRACTED_PROPERTY(QString, SenderName, senderName);
+    SINK_PROPERTY(Contact, Sender, sender);
+    SINK_PROPERTY(QList<Contact>, To, to);
+    SINK_PROPERTY(QList<Contact>, Cc, cc);
+    SINK_PROPERTY(QList<Contact>, Bcc, bcc);
     SINK_EXTRACTED_PROPERTY(QString, Subject, subject);
     SINK_EXTRACTED_PROPERTY(QDateTime, Date, date);
     SINK_PROPERTY(bool, Unread, unread);
@@ -417,5 +424,6 @@ Q_DECLARE_METATYPE(Sink::ApplicationDomain::SinkAccount)
 Q_DECLARE_METATYPE(Sink::ApplicationDomain::SinkAccount::Ptr)
 Q_DECLARE_METATYPE(Sink::ApplicationDomain::Identity)
 Q_DECLARE_METATYPE(Sink::ApplicationDomain::Identity::Ptr)
+Q_DECLARE_METATYPE(Sink::ApplicationDomain::Mail::Contact)
 Q_DECLARE_METATYPE(Sink::ApplicationDomain::Error)
 Q_DECLARE_METATYPE(Sink::ApplicationDomain::Progress)
diff --git a/common/domain/mail.cpp b/common/domain/mail.cpp
index ee58928..5a77681 100644
--- a/common/domain/mail.cpp
+++ b/common/domain/mail.cpp
@@ -38,7 +38,7 @@ void TypeImplementation<Mail>::configure(TypeIndex &index)
 {
     index.addProperty<QByteArray>(Mail::Uid::name);
     index.addProperty<QByteArray>(Mail::Sender::name);
-    index.addProperty<QByteArray>(Mail::SenderName::name);
+    /* index.addProperty<QByteArray>(Mail::SenderName::name); */
     /* index->addProperty<QString>(Mail::Subject::name); */
     /* index->addFulltextProperty<QString>(Mail::Subject::name); */
     index.addProperty<QDateTime>(Mail::Date::name);
@@ -68,7 +68,7 @@ void TypeImplementation<Mail>::configure(ReadPropertyMapper<Buffer> &propertyMap
 {
     propertyMapper.addMapping<Mail::Uid, Buffer>(&Buffer::uid);
     propertyMapper.addMapping<Mail::Sender, Buffer>(&Buffer::sender);
-    propertyMapper.addMapping<Mail::SenderName, Buffer>(&Buffer::senderName);
+    /* propertyMapper.addMapping<Mail::Recepients, Buffer>(&Buffer::recepients); */
     propertyMapper.addMapping<Mail::Subject, Buffer>(&Buffer::subject);
     propertyMapper.addMapping<Mail::Date, Buffer>(&Buffer::date);
     propertyMapper.addMapping<Mail::Unread, Buffer>(&Buffer::unread);
@@ -86,7 +86,7 @@ void TypeImplementation<Mail>::configure(WritePropertyMapper<BufferBuilder> &pro
 {
     propertyMapper.addMapping<Mail::Uid>(&BufferBuilder::add_uid);
     propertyMapper.addMapping<Mail::Sender>(&BufferBuilder::add_sender);
-    propertyMapper.addMapping<Mail::SenderName>(&BufferBuilder::add_senderName);
+    /* propertyMapper.addMapping<Mail::Recepients>(&BufferBuilder::add_senderName); */
     propertyMapper.addMapping<Mail::Subject>(&BufferBuilder::add_subject);
     propertyMapper.addMapping<Mail::Date>(&BufferBuilder::add_date);
     propertyMapper.addMapping<Mail::Unread>(&BufferBuilder::add_unread);
diff --git a/common/domain/mail.fbs b/common/domain/mail.fbs
index f14e9f1..737a671 100644
--- a/common/domain/mail.fbs
+++ b/common/domain/mail.fbs
@@ -1,10 +1,17 @@
 namespace Sink.ApplicationDomain.Buffer;
 
+table MailContact {
+    name: string;
+    email: string;
+}
+
 table Mail {
   uid:string;
   folder:string;
-  sender:string;
-  senderName:string;
+  sender:MailContact;
+  to:[MailContact];
+  cc:[MailContact];
+  bcc:[MailContact];
   subject:string;
   date:string;
   unread:bool = false;