diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 17a4be0a..37c85666 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,4 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.openxchange.oxtalk">
 
     <!-- The INTERNET permission is required for development. Specifically,
@@ -42,5 +43,16 @@
             android:name="com.yalantis.ucrop.UCropActivity"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.fileProvider"
+            android:exported="false"
+            android:grantUriPermissions="true"
+            tools:replace="android:authorities">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/filepaths"
+                tools:replace="android:resource" />
+        </provider>
     </application>
 </manifest>
diff --git a/android/gradle.properties b/android/gradle.properties
index 8bd86f68..4d3226ab 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1 +1,3 @@
 org.gradle.jvmargs=-Xmx1536M
+android.useAndroidX=true
+android.enableJetifier=true
\ No newline at end of file
diff --git a/lib/main.dart b/lib/main.dart
index 34dffd05..fe37dc37 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -40,17 +40,20 @@
  * for more details.
  */
 
+import 'dart:async';
+
 import 'package:bloc/bloc.dart';
 import 'package:delta_chat_core/delta_chat_core.dart';
 import 'package:flutter/material.dart';
-import 'package:ox_talk/source/base/bloc_delegate.dart';
+import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:ox_talk/source/log/bloc_delegate.dart';
+import 'package:ox_talk/source/chatlist/create_chat.dart';
 import 'package:ox_talk/source/contact/contact_change.dart';
 import 'package:ox_talk/source/l10n/localizations.dart';
 import 'package:ox_talk/source/login/login.dart';
 import 'package:ox_talk/source/main/root.dart';
 import 'package:ox_talk/source/main/splash.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
-import 'package:ox_talk/source/profile/edit_user_settings.dart';
+import 'package:ox_talk/source/profile/edit_account_settings.dart';
 
 void main() {
   BlocSupervisor().delegate = DebugBlocDelegate();
@@ -58,11 +61,11 @@ void main() {
 }
 
 class OxTalkApp extends StatelessWidget {
-
   static const String ROUTES_ROOT = "/";
 
   static const ROUTES_CONTACT_ADD = '/contactAdd';
-  static const ROUTES_EDIT_USER = '/editUser';
+  static const ROUTES_PROFILE_EDIT = '/profileEdit';
+  static const ROUTES_CHAT_CREATE = '/chatCreate';
 
   @override
   Widget build(BuildContext context) {
@@ -81,7 +84,11 @@ class OxTalkApp extends StatelessWidget {
       initialRoute: ROUTES_ROOT,
       routes: {
         ROUTES_ROOT: (context) => _OxTalk(),
-        ROUTES_CONTACT_ADD: (context) => ContactChange(add: true,),
+        ROUTES_CONTACT_ADD: (context) => ContactChange(
+              contactAction: ContactAction.add,
+            ),
+        ROUTES_PROFILE_EDIT: (context) => EditAccountSettings(),
+        ROUTES_CHAT_CREATE: (context) => CreateChat(),
       },
     );
   }
@@ -93,8 +100,8 @@ class _OxTalk extends StatefulWidget {
 }
 
 class _OxTalkState extends State<_OxTalk> {
-  DeltaChatCore _core;
-  Context _context;
+  DeltaChatCore _core = DeltaChatCore();
+  Context _context = Context();
   bool _coreLoaded = false;
   bool _configured = false;
 
@@ -114,15 +121,21 @@ class _OxTalkState extends State<_OxTalk> {
   }
 
   void _initCoreAndContext() async {
-    _core = DeltaChatCore();
     await _core.init();
-    _context = Context();
     await _isConfigured();
+    await _setupDefaultValues();
     setState(() {
       _coreLoaded = true;
     });
   }
 
+  Future _setupDefaultValues() async {
+    String status = await _context.getConfigValue(Context.configSelfStatus);
+    if (status == AppLocalizations.of(context).deltaChatStatusDefaultValue) {
+      await _context.setConfigValue(Context.configSelfStatus, AppLocalizations.of(context).editUserSettingsStatusDefaultValue);
+    }
+  }
+
   Future _isConfigured() async {
     _configured = await _context.isConfigured();
   }
@@ -140,5 +153,4 @@ class _OxTalkState extends State<_OxTalk> {
       _configured = true;
     });
   }
-
 }
diff --git a/lib/source/chat/chat.dart b/lib/source/chat/chat.dart
index bb8d5de1..cc1316a4 100644
--- a/lib/source/chat/chat.dart
+++ b/lib/source/chat/chat.dart
@@ -40,112 +40,63 @@
  * for more details.
  */
 
-import 'package:delta_chat_core/delta_chat_core.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:ox_talk/source/data/chat_message_repository.dart';
-import 'chat_message_item.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:ox_talk/source/chat/chat_bloc.dart';
+import 'package:ox_talk/source/chat/chat_event.dart';
+import 'package:ox_talk/source/chat/chat_state.dart';
+import 'package:ox_talk/source/chat/messages_bloc.dart';
+import 'package:ox_talk/source/chat/messages_event.dart';
+import 'package:ox_talk/source/chat/messages_state.dart';
+import 'package:ox_talk/source/widgets/avatar.dart';
+
+import 'message_item.dart';
 
 class ChatScreen extends StatefulWidget {
-  final Chat _chat;
+  final int _chatId;
 
-  ChatScreen(this._chat);
+  ChatScreen(this._chatId);
 
   @override
   _ChatScreenState createState() => new _ChatScreenState();
 }
 
-class _ChatScreenState extends State<ChatScreen> with TickerProviderStateMixin {
-  Context _context = Context();
-  List<int> messageIds = <int>[];
-  ChatMessageRepository messageRepository;
+class _ChatScreenState extends State<ChatScreen> {
+  ChatBloc _chatBloc = ChatBloc();
+  MessagesBloc _messagesBloc = MessagesBloc();
+
   final TextEditingController _textController = new TextEditingController();
   bool _isComposing = false;
-  int _id;
-  String _name;
-  String _subtitle;
-  int _chatMessageListenerId;
 
   @override
   void initState() {
     super.initState();
-    setupChat();
-    setupChatListener();
-  }
-
-  void setupChat() async {
-    _id = widget._chat.getId();
-    _name = await widget._chat.getName();
-    _subtitle = await widget._chat.getSubtitle();
-
-    setState(() {});
-    setupMessages();
-  }
-
-  void setupMessages() async {
-    messageIds = List.from(await _context.getChatMessages(_id));
-    messageRepository = ChatMessageRepository(ChatMsg.getCreator());
-    messageRepository.putIfAbsent(ids: messageIds);
-    messageIds = messageIds.reversed.toList();
-    setState(() {});
+    _chatBloc.dispatch(RequestChat(widget._chatId));
+    _messagesBloc.dispatch(RequestMessages(widget._chatId));
   }
 
   @override
   Widget build(BuildContext context) {
     return new Scaffold(
         appBar: new AppBar(
-          title: Row(
-            children: <Widget>[
-              CircleAvatar(
-                radius: 24.0,
-                //TODO: Add avatar if available
-                child: Text(getInitial()),
-              ),
-              Padding(padding: EdgeInsets.only(left: 8.0)),
-              Flexible(
-                  child: Column(
-                mainAxisAlignment: MainAxisAlignment.center,
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: <Widget>[
-                  _name != null
-                      ? Text(
-                          _name,
-                          softWrap: true,
-                          overflow: TextOverflow.ellipsis,
-                          style: TextStyle(
-                            fontSize: 16,
-                          ),
-                        )
-                      : Container(),
-                  _subtitle != null ? Text(_subtitle, style: TextStyle(fontSize: 14)) : Container(),
-                ],
-              ))
-            ],
-          ),
+          title: buildTitle(),
           actions: <Widget>[
             IconButton(
               icon: Icon(Icons.videocam),
-              onPressed: _handleVideoCall(),
+              onPressed: null,
+              color: Colors.white,
+            ),
+            IconButton(
+              icon: Icon(Icons.phone),
+              onPressed: null,
               color: Colors.white,
             ),
-            IconButton(icon: Icon(Icons.phone), onPressed: _handleVoiceCall(), color: Colors.white)
           ],
           elevation: Theme.of(context).platform == TargetPlatform.iOS ? 0.0 : 4.0,
         ),
         body: new Column(children: <Widget>[
-          new Flexible(
-              child: new ListView.builder(
-            padding: new EdgeInsets.all(8.0),
-            reverse: true,
-            itemCount: messageIds.length,
-            itemBuilder: (BuildContext context, int index) {
-              var messageId = messageIds[index];
-              var _message = messageRepository.get(messageId);
-              return ChatMessageItem(
-                _message,
-              );
-            },
-          )),
+          new Flexible(child: buildListView()),
           new Divider(height: 1.0),
           new Container(
             decoration: new BoxDecoration(color: Theme.of(context).cardColor),
@@ -154,6 +105,87 @@ class _ChatScreenState extends State<ChatScreen> with TickerProviderStateMixin {
         ]));
   }
 
+  Widget buildTitle() {
+    return BlocBuilder(
+      bloc: _chatBloc,
+      builder: (context, state) {
+        String name;
+        String subTitle;
+        Color color;
+        if (state is ChatStateSuccess) {
+          name = state.name;
+          subTitle = state.subTitle;
+          color = state.color;
+        } else {
+          name = "";
+          subTitle = "";
+        }
+        return Row(
+          children: <Widget>[
+            Avatar(
+              initials: getInitials(name, subTitle),
+              color: color,
+            ),
+            Padding(padding: EdgeInsets.only(left: 16.0)),
+            Flexible(
+              child: Column(
+                mainAxisAlignment: MainAxisAlignment.center,
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: <Widget>[
+                  Text(
+                    name,
+                    softWrap: true,
+                    overflow: TextOverflow.ellipsis,
+                    style: TextStyle(
+                      fontSize: 16,
+                    ),
+                  ),
+                  Row(
+                    children: <Widget>[
+                      _chatBloc.isGroup
+                          ? Padding(
+                              padding: const EdgeInsets.only(right: 4.0),
+                              child: Icon(
+                                Icons.group,
+                                size: 18,
+                              ))
+                          : Container(),
+                      Text(subTitle, style: TextStyle(fontSize: 14)),
+                    ],
+                  ),
+                ],
+              ),
+            ),
+          ],
+        );
+      },
+    );
+  }
+
+  Widget buildListView() {
+    return BlocBuilder(
+      bloc: _messagesBloc,
+      builder: (context, state) {
+        if (state is MessagesStateSuccess) {
+          return new ListView.builder(
+            padding: new EdgeInsets.all(8.0),
+            reverse: true,
+            itemCount: state.messageIds.length,
+            itemBuilder: (BuildContext context, int index) {
+              int messageId = state.messageIds[index];
+              var key = "$messageId-${state.messageLastUpdateValues[index]}";
+              return ChatMessageItem(widget._chatId, messageId, _chatBloc.isGroup, key);
+            },
+          );
+        } else {
+          return Center(
+            child: CircularProgressIndicator(),
+          );
+        }
+      },
+    );
+  }
+
   Widget _buildTextComposer() {
     return new IconTheme(
       data: new IconThemeData(color: Theme.of(context).accentColor),
@@ -161,8 +193,8 @@ class _ChatScreenState extends State<ChatScreen> with TickerProviderStateMixin {
           margin: const EdgeInsets.symmetric(horizontal: 8.0),
           child: new Row(children: <Widget>[
             new IconButton(
-              icon: new Icon(Icons.add, color: Theme.of(context).accentColor),
-              onPressed: _handleAttachments(),
+              icon: new Icon(Icons.add),
+              onPressed: null,
             ),
             new Flexible(
                 child: Container(
@@ -181,21 +213,21 @@ class _ChatScreenState extends State<ChatScreen> with TickerProviderStateMixin {
                 ),
               ),
             )),
-            new Container(
-                margin: new EdgeInsets.symmetric(horizontal: 4.0),
-                child: _isComposing
-                    ? new IconButton(
-                        icon: new Icon(Icons.send),
-                        onPressed: () => _handleSubmitted(_textController.text),
-                      )
-                    : new IconButton(
-                        icon: new Icon(Icons.keyboard_voice),
-                        onPressed: () => _handleVoiceMessage(),
-                      )),
-            new IconButton(
-              icon: new Icon(Icons.camera_alt),
-              onPressed: () => _handleCamera(),
-            )
+            _isComposing
+                ? new IconButton(
+                    icon: new Icon(Icons.send),
+                    onPressed: () => _handleSubmitted(_textController.text),
+                  )
+                : new IconButton(
+                    icon: new Icon(Icons.keyboard_voice),
+                    onPressed: null,
+                  ),
+            !_isComposing
+                ? new IconButton(
+                    icon: new Icon(Icons.camera_alt),
+                    onPressed: null,
+                  )
+                : Container(),
           ]),
           decoration: Theme.of(context).platform == TargetPlatform.iOS
               ? new BoxDecoration(border: new Border(top: new BorderSide(color: Colors.grey[200])))
@@ -203,61 +235,21 @@ class _ChatScreenState extends State<ChatScreen> with TickerProviderStateMixin {
     );
   }
 
-  String getInitial() {
-    if (_name != null && _name.isNotEmpty) {
-      return _name.substring(0, 1);
-    }
-    return "";
-  }
-
-  void _handleSubmitted(String text) async {
+  void _handleSubmitted(String text) {
     _textController.clear();
-    int id = await _context.createChatMessage(_id, text);
-    messageIds.clear();
+    _messagesBloc.submitMessage(text);
     setState(() {
       _isComposing = false;
-      FocusScope.of(context).requestFocus(new FocusNode());
     });
-    await Future.delayed(const Duration(milliseconds: 200));
-    setupMessages();
-  }
-
-  _handleAttachments() {}
-
-  _handleVoiceMessage() {}
-
-  _handleCamera() {}
-
-  _handleVideoCall() {}
-
-  _handleVoiceCall() {}
-
-  void setupChatListener() async {
-    DeltaChatCore core = DeltaChatCore();
-    _chatMessageListenerId = await core.listen(Dc.eventIncomingMsg, _success);
   }
 
-  void _success(Event event) {
-    debugPrint("fhaar: SUCCESS!!!");
-
-    messageIds.clear();
-    setState(() {});
-    reload();
-  }
-
-  @override
-  void dispose() {
-    super.dispose();
-    tearDownChatListener();
-  }
-
-  void tearDownChatListener() {
-    DeltaChatCore core = DeltaChatCore();
-    core.removeListener(Dc.eventIncomingMsg, _chatMessageListenerId);
-  }
-
-  void reload() async {
-    await Future.delayed(const Duration(milliseconds: 200));
-    setupMessages();
+  String getInitials(String name, String subTitle) {
+    if (name != null && name.isNotEmpty) {
+      return name.substring(0, 1);
+    }
+    if (subTitle != null && subTitle.isNotEmpty) {
+      return subTitle.substring(0, 1);
+    }
+    return "";
   }
 }
diff --git a/lib/source/chat/chat_bloc.dart b/lib/source/chat/chat_bloc.dart
new file mode 100644
index 00000000..281aa8af
--- /dev/null
+++ b/lib/source/chat/chat_bloc.dart
@@ -0,0 +1,92 @@
+/*
+ * OPEN-XCHANGE legal information
+ *
+ * All intellectual property rights in the Software are protected by
+ * international copyright laws.
+ *
+ *
+ * In some countries OX, OX Open-Xchange and open xchange
+ * as well as the corresponding Logos OX Open-Xchange and OX are registered
+ * trademarks of the OX Software GmbH group of companies.
+ * The use of the Logos is not covered by the Mozilla Public License 2.0 (MPL 2.0).
+ * Instead, you are allowed to use these Logos according to the terms and
+ * conditions of the Creative Commons License, Version 2.5, Attribution,
+ * Non-commercial, ShareAlike, and the interpretation of the term
+ * Non-commercial applicable to the aforementioned license is published
+ * on the web site https://www.open-xchange.com/terms-and-conditions/.
+ *
+ * Please make sure that third-party modules and libraries are used
+ * according to their respective licenses.
+ *
+ * Any modifications to this package must retain all copyright notices
+ * of the original copyright holder(s) for the original code used.
+ *
+ * After any such modifications, the original and derivative code shall remain
+ * under the copyright of the copyright holder(s) and/or original author(s) as stated here:
+ * https://www.open-xchange.com/legal/. The contributing author shall be
+ * given Attribution for the derivative code and a license granting use.
+ *
+ * Copyright (C) 2016-2020 OX Software GmbH
+ * Mail: info@open-xchange.com
+ *
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the Mozilla Public License 2.0
+ * for more details.
+ */
+
+import 'dart:async';
+import 'dart:ui';
+
+import 'package:bloc/bloc.dart';
+import 'package:delta_chat_core/delta_chat_core.dart';
+import 'package:ox_talk/source/chat/chat_event.dart';
+import 'package:ox_talk/source/chat/chat_state.dart';
+import 'package:ox_talk/source/data/repository.dart';
+import 'package:ox_talk/source/data/repository_manager.dart';
+import 'package:ox_talk/source/utils/colors.dart';
+
+class ChatBloc extends Bloc<ChatEvent, ChatState> {
+  Repository<Chat> chatRepository = RepositoryManager.get(RepositoryType.chat);
+  int _chatId;
+  bool _isGroup = false;
+  bool get isGroup => _isGroup;
+
+  @override
+  ChatState get initialState => ChatStateInitial();
+
+  @override
+  Stream<ChatState> mapEventToState(ChatState currentState, ChatEvent event) async* {
+    if (event is RequestChat) {
+      yield ChatStateLoading();
+      try {
+        _chatId = event.chatId;
+        _setupChat();
+      } catch (error) {
+        yield ChatStateFailure(error: error.toString());
+      }
+    } else if (event is ChatLoaded) {
+      yield ChatStateSuccess(
+        name: event.name,
+        subTitle: event.subTitle,
+        color: event.color,
+        isGroupChat: event.isGroupChat,
+      );
+    }
+  }
+
+  void _setupChat() async {
+    Chat chat = chatRepository.get(_chatId);
+    String name = await chat.getName();
+    String subTitle = await chat.getSubtitle();
+    int colorValue = await chat.getColor();
+    _isGroup = await chat.isGroup();
+    Color color = rgbColorFromInt(colorValue);
+    dispatch(ChatLoaded(name, subTitle, color, _isGroup));
+  }
+}
diff --git a/lib/source/profile/user.dart b/lib/source/chat/chat_event.dart
similarity index 79%
rename from lib/source/profile/user.dart
rename to lib/source/chat/chat_event.dart
index 3d3b0a5f..8dd575df 100644
--- a/lib/source/profile/user.dart
+++ b/lib/source/chat/chat_event.dart
@@ -40,31 +40,21 @@
  * for more details.
  */
 
-import 'package:delta_chat_core/delta_chat_core.dart';
+import 'dart:ui';
 
-class User extends Base {
-  static final User _user = new User._internal(1);
-  final int id;
+abstract class ChatEvent {}
 
-  String username;
-  String status;
-  String avatarPath;
-  String email;
-  String imapLogin;
-  String imapServer;
-  String imapPort;
-  String smtpLogin;
-  String smtpPassword;
-  String smtpServer;
-  String smtpPort;
+class RequestChat extends ChatEvent {
+  int chatId;
 
-  User._internal(this.id);
+  RequestChat(this.chatId);
+}
 
-  factory User() {
-    return _user;
-  }
+class ChatLoaded extends ChatEvent {
+  final String name;
+  final String subTitle;
+  final Color color;
+  final bool isGroupChat;
 
-  static Function getCreator() {
-    return (id) => User();
-  }
+  ChatLoaded(this.name, this.subTitle, this.color, this.isGroupChat);
 }
diff --git a/lib/source/chat/chat_message_item.dart b/lib/source/chat/chat_message_item.dart
deleted file mode 100644
index 8d6de1ac..00000000
--- a/lib/source/chat/chat_message_item.dart
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- * OPEN-XCHANGE legal information
- *
- * All intellectual property rights in the Software are protected by
- * international copyright laws.
- *
- *
- * In some countries OX, OX Open-Xchange and open xchange
- * as well as the corresponding Logos OX Open-Xchange and OX are registered
- * trademarks of the OX Software GmbH group of companies.
- * The use of the Logos is not covered by the Mozilla Public License 2.0 (MPL 2.0).
- * Instead, you are allowed to use these Logos according to the terms and
- * conditions of the Creative Commons License, Version 2.5, Attribution,
- * Non-commercial, ShareAlike, and the interpretation of the term
- * Non-commercial applicable to the aforementioned license is published
- * on the web site https://www.open-xchange.com/terms-and-conditions/.
- *
- * Please make sure that third-party modules and libraries are used
- * according to their respective licenses.
- *
- * Any modifications to this package must retain all copyright notices
- * of the original copyright holder(s) for the original code used.
- *
- * After any such modifications, the original and derivative code shall remain
- * under the copyright of the copyright holder(s) and/or original author(s) as stated here:
- * https://www.open-xchange.com/legal/. The contributing author shall be
- * given Attribution for the derivative code and a license granting use.
- *
- * Copyright (C) 2016-2020 OX Software GmbH
- * Mail: info@open-xchange.com
- *
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the Mozilla Public License 2.0
- * for more details.
- */
-
-import 'package:delta_chat_core/delta_chat_core.dart';
-import 'package:flutter/material.dart';
-import 'package:date_format/date_format.dart';
-
-class ChatMessageItem extends StatefulWidget {
-  final ChatMsg _msg;
-
-  ChatMessageItem(this._msg);
-
-  @override
-  _ChatMessageItemState createState() => _ChatMessageItemState();
-}
-
-class _ChatMessageItemState extends State<ChatMessageItem>  with TickerProviderStateMixin{
-  final double textMaxWidth = 200.0;
-  AnimationController animationController;
-  String _text;
-  String _timestamp;
-  bool _isOutgoing;
-
-  @override
-  void initState() {
-    super.initState();
-//    animationController = AnimationController(duration: new Duration(milliseconds: 700), vsync: this, );
-    setupMessage();
-  }
-
-  void setupMessage() async{
-    if(widget._msg != null) {
-      _text = await widget._msg.getText();
-      var timestamp = await widget._msg.getTimestamp();
-      _timestamp = formatDate(
-          DateTime.fromMillisecondsSinceEpoch(timestamp), [HH, ':', nn]);
-      _isOutgoing = await widget._msg.isOutgoing();
-
-      setState(() {});
-//      if (animationController != null) {
-//        animationController.forward();
-//      }
-    }
-    else{
-      debugPrint("fhaar: MSG IS NULL!!!");
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return new Container(
-      margin: const EdgeInsets.symmetric(vertical: 10.0),
-      child: new Row(
-        children:
-        _isOutgoing != null ? (_isOutgoing ? getSentMessageLayout() : getReceivedMessageLayout()) : <Widget>[],
-      ),
-    );
-//    return new SizeTransition(
-//      sizeFactor: new CurvedAnimation(
-//        parent: animationController, curve: Curves.easeOut),
-//        axisAlignment: 0.0,
-//        child: new Container(
-//          margin: const EdgeInsets.symmetric(vertical: 10.0),
-//          child: new Row(
-//            children:
-//             _isOutgoing != null ? (_isOutgoing ? getSentMessageLayout() : getReceivedMessageLayout()) : <Widget>[],
-//        ),
-//      ),
-//    );
-  }
-
-  List<Widget> getSentMessageLayout() {
-    return <Widget>[
-      Expanded(
-        child: Padding(
-          padding: EdgeInsets.only(left: 4.0, right: 4.0),
-          child:  Column(
-            crossAxisAlignment: CrossAxisAlignment.end,
-            children: <Widget>[
-              LimitedBox(
-                  maxWidth: 260,
-                  child:Container(
-                    decoration: BoxDecoration(
-                        shape: BoxShape.rectangle,
-                        boxShadow: [
-                          new BoxShadow(
-                            color: Colors.grey,
-                            blurRadius: 2.0,
-                          ),
-                        ],
-                        color: Colors.cyanAccent,
-                        borderRadius: BorderRadius.all(Radius.circular(8.0))
-                    ),
-                    child: Column(
-                      mainAxisAlignment: MainAxisAlignment.end,
-                      crossAxisAlignment: CrossAxisAlignment.end,
-                      children: <Widget>[
-//                    SizedBox(
-//                      width: 260,
-//                      child: Image.network("https://images.pexels.com/photos/40541/christmas-snow-snowman-decoration-40541.jpeg", fit: BoxFit.cover,   ),
-////                      width: 255,
-//                    ),
-                        Padding(
-                          padding: EdgeInsets.all(8.0),
-                          child: new Row(
-                            crossAxisAlignment: CrossAxisAlignment.end,
-                            mainAxisSize: MainAxisSize.min,
-                            children: <Widget>[
-                              LimitedBox(
-                                maxWidth: textMaxWidth,
-                                child: _text != null ? new Text(
-                                  _text,
-                                ): Container(),
-                              ),
-                              Padding(padding: EdgeInsets.only(left: 8.0)),
-                              _timestamp != null ? new Text(
-                                  _timestamp,
-                                  style: TextStyle(
-                                    fontSize: 12,
-                                  )
-                              ): Container(),
-                            ],
-                          ),
-                        )
-                      ],
-                    ),
-                  )
-              )
-            ],
-          ),
-        ),
-      )
-    ];
-  }
-
-  List<Widget> getReceivedMessageLayout() {
-    return <Widget>[
-      Container(
-          padding: EdgeInsets.only(left: 4.0, right: 4.0),
-          child:Column(
-            crossAxisAlignment: CrossAxisAlignment.end,
-            children: <Widget>[
-              LimitedBox(
-                  maxWidth: 260,
-                  child:Container(
-                    decoration: BoxDecoration(shape: BoxShape.rectangle, boxShadow: [new BoxShadow(
-                      color: Colors.grey,
-                      blurRadius: 2.0,
-                    ),], color: Colors.white, borderRadius: BorderRadius.all(Radius.circular(8.0))),
-                    child: Column(
-                      mainAxisAlignment: MainAxisAlignment.end,
-                      crossAxisAlignment: CrossAxisAlignment.end,
-                      children: <Widget>[
-//                    SizedBox(
-//                      width: 260,
-//                      child: Image.network("https://images.pexels.com/photos/40541/christmas-snow-snowman-decoration-40541.jpeg", fit: BoxFit.cover,   ),
-////                      width: 255,
-//                    ),
-                        Padding(
-                          padding: EdgeInsets.all(8.0),
-                          child: new Row(
-                            crossAxisAlignment: CrossAxisAlignment.end,
-                            mainAxisSize: MainAxisSize.min,
-                            children: <Widget>[
-                              LimitedBox(
-                                maxWidth: textMaxWidth,
-                                child: _text != null ? new Text(
-                                  _text,
-                                ):Container(),
-                              ),
-                              Padding(padding: EdgeInsets.only(left: 8.0)),
-                              _timestamp != null ? new Text(
-                                  _timestamp,
-                                  style: TextStyle(
-                                    fontSize: 12,
-                                  )
-                              ): Container(),
-                            ],
-                          ),
-                        )
-                      ],
-                    ),
-                  )
-              )
-            ],
-          )
-      )
-    ];
-  }
-
-  @override
-  void dispose() {
-    if(animationController != null) {
-      animationController.dispose();
-    }
-    super.dispose();
-  }
-}
-//Image.network("https://images.pexels.com/photos/40541/christmas-snow-snowman-decoration-40541.jpeg", width: 200, height: 150,),
\ No newline at end of file
diff --git a/lib/source/chat/chat_state.dart b/lib/source/chat/chat_state.dart
new file mode 100644
index 00000000..9125999d
--- /dev/null
+++ b/lib/source/chat/chat_state.dart
@@ -0,0 +1,95 @@
+/*
+ * OPEN-XCHANGE legal information
+ *
+ * All intellectual property rights in the Software are protected by
+ * international copyright laws.
+ *
+ *
+ * In some countries OX, OX Open-Xchange and open xchange
+ * as well as the corresponding Logos OX Open-Xchange and OX are registered
+ * trademarks of the OX Software GmbH group of companies.
+ * The use of the Logos is not covered by the Mozilla Public License 2.0 (MPL 2.0).
+ * Instead, you are allowed to use these Logos according to the terms and
+ * conditions of the Creative Commons License, Version 2.5, Attribution,
+ * Non-commercial, ShareAlike, and the interpretation of the term
+ * Non-commercial applicable to the aforementioned license is published
+ * on the web site https://www.open-xchange.com/terms-and-conditions/.
+ *
+ * Please make sure that third-party modules and libraries are used
+ * according to their respective licenses.
+ *
+ * Any modifications to this package must retain all copyright notices
+ * of the original copyright holder(s) for the original code used.
+ *
+ * After any such modifications, the original and derivative code shall remain
+ * under the copyright of the copyright holder(s) and/or original author(s) as stated here:
+ * https://www.open-xchange.com/legal/. The contributing author shall be
+ * given Attribution for the derivative code and a license granting use.
+ *
+ * Copyright (C) 2016-2020 OX Software GmbH
+ * Mail: info@open-xchange.com
+ *
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the Mozilla Public License 2.0
+ * for more details.
+ */
+
+import 'dart:ui';
+
+import 'package:meta/meta.dart';
+import 'package:ox_talk/source/base/bloc_base_state.dart';
+
+abstract class ChatState extends BaseState {
+  ChatState({
+    @required isLoading,
+    @required isSuccess,
+    @required error,
+  }) : super(isLoading: isLoading, isSuccess: isSuccess, error: error);
+}
+
+class ChatStateInitial extends ChatState {
+  ChatStateInitial()
+      : super(
+          isLoading: false,
+          isSuccess: false,
+          error: '',
+        );
+}
+
+class ChatStateLoading extends ChatState {
+  ChatStateLoading()
+      : super(
+          isLoading: true,
+          isSuccess: false,
+          error: '',
+        );
+}
+
+class ChatStateSuccess extends ChatState {
+  final String name;
+  final String subTitle;
+  final Color color;
+  final bool isGroupChat;
+
+  ChatStateSuccess({@required this.name, @required this.subTitle, @required this.color, @required this.isGroupChat})
+      : super(
+          isLoading: false,
+          isSuccess: true,
+          error: '',
+        );
+}
+
+class ChatStateFailure extends ChatState {
+  ChatStateFailure({@required error})
+      : super(
+          isLoading: false,
+          isSuccess: false,
+          error: error,
+        );
+}
diff --git a/lib/source/chat/message_attachment_bloc.dart b/lib/source/chat/message_attachment_bloc.dart
new file mode 100644
index 00000000..7bcdd704
--- /dev/null
+++ b/lib/source/chat/message_attachment_bloc.dart
@@ -0,0 +1,83 @@
+/*
+ * OPEN-XCHANGE legal information
+ *
+ * All intellectual property rights in the Software are protected by
+ * international copyright laws.
+ *
+ *
+ * In some countries OX, OX Open-Xchange and open xchange
+ * as well as the corresponding Logos OX Open-Xchange and OX are registered
+ * trademarks of the OX Software GmbH group of companies.
+ * The use of the Logos is not covered by the Mozilla Public License 2.0 (MPL 2.0).
+ * Instead, you are allowed to use these Logos according to the terms and
+ * conditions of the Creative Commons License, Version 2.5, Attribution,
+ * Non-commercial, ShareAlike, and the interpretation of the term
+ * Non-commercial applicable to the aforementioned license is published
+ * on the web site https://www.open-xchange.com/terms-and-conditions/.
+ *
+ * Please make sure that third-party modules and libraries are used
+ * according to their respective licenses.
+ *
+ * Any modifications to this package must retain all copyright notices
+ * of the original copyright holder(s) for the original code used.
+ *
+ * After any such modifications, the original and derivative code shall remain
+ * under the copyright of the copyright holder(s) and/or original author(s) as stated here:
+ * https://www.open-xchange.com/legal/. The contributing author shall be
+ * given Attribution for the derivative code and a license granting use.
+ *
+ * Copyright (C) 2016-2020 OX Software GmbH
+ * Mail: info@open-xchange.com
+ *
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the Mozilla Public License 2.0
+ * for more details.
+ */
+
+import 'dart:async';
+
+import 'package:bloc/bloc.dart';
+import 'package:delta_chat_core/delta_chat_core.dart';
+import 'package:open_file/open_file.dart';
+import 'package:ox_talk/source/chat/message_attachment_event.dart';
+import 'package:ox_talk/source/chat/message_attachment_state.dart';
+import 'package:ox_talk/source/data/repository.dart';
+import 'package:ox_talk/source/data/repository_manager.dart';
+
+class MessageAttachmentBloc extends Bloc<MessageAttachmentEvent, MessageAttachmentState> {
+  Repository<ChatMsg> _messagesRepository;
+
+  @override
+  MessageAttachmentState get initialState => MessageAttachmentStateInitial();
+
+  @override
+  Stream<MessageAttachmentState> mapEventToState(MessageAttachmentState currentState, MessageAttachmentEvent event) async* {
+    if (event is RequestAttachment) {
+      _messagesRepository = RepositoryManager.get(RepositoryType.chatMessage, event.chatId);
+      yield MessageAttachmentStateLoading();
+      try {
+        _openFile(event.messageId);
+        dispatch(AttachmentLoaded());
+      } catch (error) {
+        yield MessageAttachmentStateFailure(error: error.toString());
+      }
+    } else if (event is AttachmentLoaded) {
+      yield MessageAttachmentStateSuccess();
+    }
+  }
+
+  void _openFile(int messageId) async {
+    ChatMsg message = _getMessage(messageId);
+    OpenFile.open(await message.getFile());
+  }
+
+  ChatMsg _getMessage(int messageId) {
+    return _messagesRepository.get(messageId);
+  }
+}
diff --git a/lib/source/chat/message_attachment_event.dart b/lib/source/chat/message_attachment_event.dart
new file mode 100644
index 00000000..97fcd5b4
--- /dev/null
+++ b/lib/source/chat/message_attachment_event.dart
@@ -0,0 +1,52 @@
+/*
+ * OPEN-XCHANGE legal information
+ *
+ * All intellectual property rights in the Software are protected by
+ * international copyright laws.
+ *
+ *
+ * In some countries OX, OX Open-Xchange and open xchange
+ * as well as the corresponding Logos OX Open-Xchange and OX are registered
+ * trademarks of the OX Software GmbH group of companies.
+ * The use of the Logos is not covered by the Mozilla Public License 2.0 (MPL 2.0).
+ * Instead, you are allowed to use these Logos according to the terms and
+ * conditions of the Creative Commons License, Version 2.5, Attribution,
+ * Non-commercial, ShareAlike, and the interpretation of the term
+ * Non-commercial applicable to the aforementioned license is published
+ * on the web site https://www.open-xchange.com/terms-and-conditions/.
+ *
+ * Please make sure that third-party modules and libraries are used
+ * according to their respective licenses.
+ *
+ * Any modifications to this package must retain all copyright notices
+ * of the original copyright holder(s) for the original code used.
+ *
+ * After any such modifications, the original and derivative code shall remain
+ * under the copyright of the copyright holder(s) and/or original author(s) as stated here:
+ * https://www.open-xchange.com/legal/. The contributing author shall be
+ * given Attribution for the derivative code and a license granting use.
+ *
+ * Copyright (C) 2016-2020 OX Software GmbH
+ * Mail: info@open-xchange.com
+ *
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the Mozilla Public License 2.0
+ * for more details.
+ */
+
+abstract class MessageAttachmentEvent {}
+
+class RequestAttachment extends MessageAttachmentEvent {
+  final int chatId;
+  final int messageId;
+
+  RequestAttachment(this.chatId, this.messageId);
+}
+
+class AttachmentLoaded extends MessageAttachmentEvent {}
diff --git a/lib/source/chat/message_attachment_state.dart b/lib/source/chat/message_attachment_state.dart
new file mode 100644
index 00000000..4769d2bb
--- /dev/null
+++ b/lib/source/chat/message_attachment_state.dart
@@ -0,0 +1,88 @@
+/*
+ * OPEN-XCHANGE legal information
+ *
+ * All intellectual property rights in the Software are protected by
+ * international copyright laws.
+ *
+ *
+ * In some countries OX, OX Open-Xchange and open xchange
+ * as well as the corresponding Logos OX Open-Xchange and OX are registered
+ * trademarks of the OX Software GmbH group of companies.
+ * The use of the Logos is not covered by the Mozilla Public License 2.0 (MPL 2.0).
+ * Instead, you are allowed to use these Logos according to the terms and
+ * conditions of the Creative Commons License, Version 2.5, Attribution,
+ * Non-commercial, ShareAlike, and the interpretation of the term
+ * Non-commercial applicable to the aforementioned license is published
+ * on the web site https://www.open-xchange.com/terms-and-conditions/.
+ *
+ * Please make sure that third-party modules and libraries are used
+ * according to their respective licenses.
+ *
+ * Any modifications to this package must retain all copyright notices
+ * of the original copyright holder(s) for the original code used.
+ *
+ * After any such modifications, the original and derivative code shall remain
+ * under the copyright of the copyright holder(s) and/or original author(s) as stated here:
+ * https://www.open-xchange.com/legal/. The contributing author shall be
+ * given Attribution for the derivative code and a license granting use.
+ *
+ * Copyright (C) 2016-2020 OX Software GmbH
+ * Mail: info@open-xchange.com
+ *
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. 
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the Mozilla Public License 2.0
+ * for more details.
+ */
+
+import 'package:meta/meta.dart';
+import 'package:ox_talk/source/base/bloc_base_state.dart';
+
+abstract class MessageAttachmentState extends BaseState {
+  MessageAttachmentState({
+    @required isLoading,
+    @required isSuccess,
+    @required error,
+  }) : super(isLoading: isLoading, isSuccess: isSuccess, error: error);
+}
+
+class MessageAttachmentStateInitial extends MessageAttachmentState {
+  MessageAttachmentStateInitial()
+      : super(
+          isLoading: false,
+          isSuccess: false,
+          error: '',
+        );
+}
+
+class MessageAttachmentStateLoading extends MessageAttachmentState {
+  MessageAttachmentStateLoading()
+      : super(
+          isLoading: true,
+          isSuccess: false,
+          error: '',
+        );
+}
+
+class MessageAttachmentStateSuccess extends MessageAttachmentState {
+  MessageAttachmentStateSuccess()
+      : super(
+          isLoading: false,
+          isSuccess: true,
+          error: '',
+        );
+}
+
+class MessageAttachmentStateFailure extends MessageAttachmentState {
+  MessageAttachmentStateFailure({@required error})
+      : super(
+          isLoading: false,
+          isSuccess: false,
+          error: error,
+        );
+}
diff --git a/lib/source/chat/message_item.dart b/lib/source/chat/message_item.dart
new file mode 100644
index 00000000..7f35a545
--- /dev/null
+++ b/lib/source/chat/message_item.dart
@@ -0,0 +1,260 @@
+/*
+ * OPEN-XCHANGE legal information
+ *
+ * All intellectual property rights in the Software are protected by
+ * international copyright laws.
+ *
+ *
+ * In some countries OX, OX Open-Xchange and open xchange
+ * as well as the corresponding Logos OX Open-Xchange and OX are registered
+ * trademarks of the OX Software GmbH group of companies.
+ * The use of the Logos is not covered by the Mozilla Public License 2.0 (MPL 2.0).
+ * Instead, you are allowed to use these Logos according to the terms and
+ * conditions of the Creative Commons License, Version 2.5, Attribution,
+ * Non-commercial, ShareAlike, and the interpretation of the term
+ * Non-commercial applicable to the aforementioned license is published
+ * on the web site https://www.open-xchange.com/terms-and-conditions/.
+ *
+ * Please make sure that third-party modules and libraries are used
+ * according to their respective licenses.
+ *
+ * Any modifications to this package must retain all copyright notices
+ * of the original copyright holder(s) for the original code used.
+ *
+ * After any such modifications, the original and derivative code shall remain
+ * under the copyright of the copyright holder(s) and/or original author(s) as stated here:
+ * https://www.open-xchange.com/legal/. The contributing author shall be
+ * given Attribution for the derivative code and a license granting use.
+ *
+ * Copyright (C) 2016-2020 OX Software GmbH
+ * Mail: info@open-xchange.com
+ *
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the Mozilla Public License 2.0
+ * for more details.
+ */
+
+import 'dart:io';
+
+import 'package:delta_chat_core/delta_chat_core.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:ox_talk/source/chat/message_attachment_bloc.dart';
+import 'package:ox_talk/source/chat/message_attachment_event.dart';
+import 'package:ox_talk/source/chat/message_item_bloc.dart';
+import 'package:ox_talk/source/chat/message_item_event.dart';
+import 'package:ox_talk/source/chat/message_item_state.dart';
+import 'package:ox_talk/source/widgets/avatar.dart';
+import 'package:ox_talk/source/utils/conversion.dart';
+
+class ChatMessageItem extends StatefulWidget {
+  final int _chatId;
+  final int _messageId;
+  final bool _isGroupChat;
+
+  ChatMessageItem(this._chatId, this._messageId, this._isGroupChat, key) : super(key: Key(key));
+
+  @override
+  _ChatMessageItemState createState() => _ChatMessageItemState();
+}
+
+class _ChatMessageItemState extends State<ChatMessageItem> with TickerProviderStateMixin {
+  MessageItemBloc _messagesBloc = MessageItemBloc();
+  MessageAttachmentBloc _attachmentBloc = MessageAttachmentBloc();
+
+  @override
+  void initState() {
+    super.initState();
+    _messagesBloc.dispatch(RequestMessage(widget._chatId, widget._messageId, widget._isGroupChat));
+  }
+
+  Widget build(BuildContext context) {
+    return BlocBuilder(
+      bloc: _messagesBloc,
+      builder: (context, state) {
+        if (state is MessageItemStateSuccess) {
+          return Container(
+            margin: const EdgeInsets.symmetric(vertical: 8.0),
+            child: state.messageIsOutgoing
+                ? buildSentMessage(state)
+                : buildReceivedMessage(
+                    widget._isGroupChat,
+                    state,
+                  ),
+          );
+        } else {
+          return Center(
+            child: CircularProgressIndicator(),
+          );
+        }
+      },
+    );
+  }
+
+  Widget buildSentMessage(MessageItemStateSuccess state) {
+    String text = state.messageText;
+    String time = state.messageTimestamp;
+    bool hasFile = state.hasFile;
+    return FractionallySizedBox(
+        alignment: Alignment.topRight,
+        widthFactor: 0.8,
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.end,
+          mainAxisSize: MainAxisSize.min,
+          children: <Widget>[
+            Container(
+              decoration: buildBoxDecoration(Colors.blue[50]),
+              child: Padding(
+                padding: EdgeInsets.all(8.0),
+                child: hasFile ? buildAttachmentMessage(state.attachmentWrapper, time) : buildTextMessage(text, time),
+              ),
+            ),
+          ],
+        ));
+  }
+
+  BoxDecoration buildBoxDecoration(Color color) {
+    return BoxDecoration(
+        shape: BoxShape.rectangle,
+        boxShadow: [
+          new BoxShadow(
+            color: Colors.grey,
+            blurRadius: 2.0,
+          ),
+        ],
+        color: color,
+        borderRadius: BorderRadius.all(Radius.circular(8.0)));
+  }
+
+  Widget buildAttachmentMessage(AttachmentWrapper attachment, String time) {
+    return GestureDetector(
+      onTap: _openAttachment,
+      child: attachment.type == ChatMsg.typeImage ? buildImageAttachmentMessage(attachment, time) : buildGenericAttachmentMessage(attachment, time),
+    );
+  }
+
+  Row buildGenericAttachmentMessage(AttachmentWrapper attachment, String time) {
+    return Row(
+      crossAxisAlignment: CrossAxisAlignment.end,
+      mainAxisSize: MainAxisSize.min,
+      children: <Widget>[
+        Icon(
+          Icons.attach_file,
+          size: 30.0,
+        ),
+        Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          mainAxisAlignment: MainAxisAlignment.start,
+          children: <Widget>[
+            Text(attachment.filename),
+            Text(byteToPrintableSize(attachment.size)),
+          ],
+        ),
+        Padding(padding: EdgeInsets.only(left: 8.0)),
+        buildTime(time),
+      ],
+    );
+  }
+
+  Widget buildImageAttachmentMessage(AttachmentWrapper attachment, String time) {
+    File file = File(attachment.path);
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.end,
+      mainAxisSize: MainAxisSize.min,
+      children: <Widget>[
+        Image.file(file),
+        Padding(padding: EdgeInsets.only(top: 4.0)),
+        buildTime(time),
+      ],
+    );
+  }
+
+  Widget buildTextMessage(String text, String time) {
+    return Row(
+      crossAxisAlignment: CrossAxisAlignment.end,
+      mainAxisSize: MainAxisSize.min,
+      children: <Widget>[
+        Flexible(
+          child: Text(text),
+        ),
+        Padding(padding: EdgeInsets.only(left: 8.0)),
+        buildTime(time),
+      ],
+    );
+  }
+
+  StatelessWidget buildTime(String time) {
+    return Text(time,
+        style: TextStyle(
+          color: Colors.grey[700],
+          fontSize: 12,
+        ));
+  }
+
+  Widget buildReceivedMessage(bool isGroupChat, MessageItemStateSuccess state) {
+    String name = state.contactName;
+    String email = state.contactAddress;
+    String text = state.messageText;
+    Color color = state.contactColor;
+    String time = state.messageTimestamp;
+    bool hasFile = state.hasFile;
+    return FractionallySizedBox(
+      alignment: Alignment.topLeft,
+      widthFactor: 0.8,
+      child: Row(
+        children: <Widget>[
+          isGroupChat
+              ? Padding(
+                  padding: const EdgeInsets.only(right: 8.0),
+                  child: Avatar(
+                    initials: getInitials(name, email),
+                    color: color,
+                  ),
+                )
+              : Container(),
+          Flexible(
+            child: Container(
+              padding: EdgeInsets.all(8.0),
+              decoration: buildBoxDecoration(Colors.white),
+              child: Column(
+                mainAxisSize: MainAxisSize.min,
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: <Widget>[
+                  isGroupChat
+                      ? Text(
+                          name,
+                          style: TextStyle(color: color),
+                        )
+                      : Container(
+                          constraints: BoxConstraints(maxWidth: 0.0),
+                        ),
+                  hasFile ? buildAttachmentMessage(state.attachmentWrapper, time) : buildTextMessage(text, time),
+                ],
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  String getInitials(String name, String email) {
+    if (name != null && name.isNotEmpty) {
+      return name.substring(0, 1);
+    }
+    if (email != null && email.isNotEmpty) {
+      return email.substring(0, 1);
+    }
+    return "";
+  }
+
+  void _openAttachment() {
+    _attachmentBloc.dispatch(RequestAttachment(widget._chatId, widget._messageId));
+  }
+}
diff --git a/lib/source/chat/message_item_bloc.dart b/lib/source/chat/message_item_bloc.dart
new file mode 100644
index 00000000..38a1310e
--- /dev/null
+++ b/lib/source/chat/message_item_bloc.dart
@@ -0,0 +1,154 @@
+/*
+ * OPEN-XCHANGE legal information
+ *
+ * All intellectual property rights in the Software are protected by
+ * international copyright laws.
+ *
+ *
+ * In some countries OX, OX Open-Xchange and open xchange
+ * as well as the corresponding Logos OX Open-Xchange and OX are registered
+ * trademarks of the OX Software GmbH group of companies.
+ * The use of the Logos is not covered by the Mozilla Public License 2.0 (MPL 2.0).
+ * Instead, you are allowed to use these Logos according to the terms and
+ * conditions of the Creative Commons License, Version 2.5, Attribution,
+ * Non-commercial, ShareAlike, and the interpretation of the term
+ * Non-commercial applicable to the aforementioned license is published
+ * on the web site https://www.open-xchange.com/terms-and-conditions/.
+ *
+ * Please make sure that third-party modules and libraries are used
+ * according to their respective licenses.
+ *
+ * Any modifications to this package must retain all copyright notices
+ * of the original copyright holder(s) for the original code used.
+ *
+ * After any such modifications, the original and derivative code shall remain
+ * under the copyright of the copyright holder(s) and/or original author(s) as stated here:
+ * https://www.open-xchange.com/legal/. The contributing author shall be
+ * given Attribution for the derivative code and a license granting use.
+ *
+ * Copyright (C) 2016-2020 OX Software GmbH
+ * Mail: info@open-xchange.com
+ *
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the Mozilla Public License 2.0
+ * for more details.
+ */
+
+import 'dart:async';
+import 'dart:ui';
+
+import 'package:bloc/bloc.dart';
+import 'package:delta_chat_core/delta_chat_core.dart';
+import 'package:ox_talk/source/chat/message_item_event.dart';
+import 'package:ox_talk/source/chat/message_item_state.dart';
+import 'package:ox_talk/source/data/repository.dart';
+import 'package:ox_talk/source/data/repository_manager.dart';
+import 'package:ox_talk/source/utils/date.dart';
+import 'package:ox_talk/source/utils/colors.dart';
+
+class MessageItemBloc extends Bloc<MessageItemEvent, MessageItemState> {
+  final Repository<Contact> _contactRepository = RepositoryManager.get(RepositoryType.contact);
+  Repository<ChatMsg> _messagesRepository;
+  int _messageId;
+  int _contactId;
+  bool _isGroupChat;
+
+  @override
+  MessageItemState get initialState => MessageItemStateInitial();
+
+  @override
+  Stream<MessageItemState> mapEventToState(MessageItemState currentState, MessageItemEvent event) async* {
+    if (event is RequestMessage) {
+      yield MessageItemStateLoading();
+      try {
+        _messagesRepository = RepositoryManager.get(RepositoryType.chatMessage, event.chatId);
+        _messageId = event.messageId;
+        _isGroupChat = event.isGroupChat;
+        if (_isGroupChat) {
+          _setupContact();
+        }
+        _setupMessage();
+        dispatch(MessageLoaded());
+      } catch (error) {
+        yield MessageItemStateFailure(error: error.toString());
+      }
+    } else if (event is MessageLoaded) {
+      ChatMsg message = _getMessage();
+      bool isOutgoing = await message.isOutgoing();
+      String text = await message.getText();
+      bool hasFile = await message.hasFile();
+      String timestamp = getTimeFromTimestamp(await message.getTimestamp());
+      AttachmentWrapper attachment;
+      if (hasFile) {
+        attachment = AttachmentWrapper(
+          filename: await message.getFileName(),
+          path: await message.getFile(),
+          mimeType: await message.getFileMime(),
+          size: await message.getFileBytes(),
+          type: await message.getType(),
+        );
+      }
+      if (_isGroupChat) {
+        Contact contact = _getContact();
+        String contactName = await contact.getName();
+        String contactAddress = await contact.getAddress();
+        Color contactColor = rgbColorFromInt(await contact.getColor());
+        yield MessageItemStateSuccess(
+            attachmentWrapper: attachment,
+            contactName: contactName,
+            contactAddress: contactAddress,
+            contactColor: contactColor,
+            messageIsOutgoing: isOutgoing,
+            messageText: text,
+            hasFile: hasFile,
+            messageTimestamp: timestamp);
+      } else {
+        yield MessageItemStateSuccess(
+          attachmentWrapper: attachment,
+          messageIsOutgoing: isOutgoing,
+          messageText: text,
+          hasFile: hasFile,
+          messageTimestamp: timestamp,
+        );
+      }
+    }
+  }
+
+  void _setupContact() async {
+    ChatMsg message = _getMessage();
+    _contactId = await message.getFromId();
+    _getContact().loadValues(keys: [
+      Contact.methodContactGetName,
+      Contact.methodContactGetAddress,
+      Contact.methodContactGetColor,
+    ]);
+  }
+
+  void _setupMessage() async {
+    _getMessage().loadValues(keys: [
+      ChatMsg.methodMessageGetText,
+      ChatMsg.methodMessageGetTimestamp,
+      ChatMsg.methodMessageIsOutgoing,
+      ChatMsg.methodMessageHasFile,
+      ChatMsg.methodMessageGetFile,
+      ChatMsg.methodMessageGetFileMime,
+      ChatMsg.methodMessageGetType,
+      ChatMsg.methodMessageGetFileBytes,
+      ChatMsg.methodMessageGetFilename,
+    ]);
+  }
+
+  Contact _getContact() {
+    return _contactRepository.get(_contactId);
+  }
+
+  ChatMsg _getMessage() {
+    return _messagesRepository.get(_messageId);
+  }
+}
diff --git a/lib/source/ui/default_colors.dart b/lib/source/chat/message_item_event.dart
similarity index 87%
rename from lib/source/ui/default_colors.dart
rename to lib/source/chat/message_item_event.dart
index 43e09c2e..77393009 100644
--- a/lib/source/ui/default_colors.dart
+++ b/lib/source/chat/message_item_event.dart
@@ -40,16 +40,14 @@
  * for more details.
  */
 
-import 'dart:ui';
+abstract class MessageItemEvent {}
 
-import 'package:flutter/material.dart';
+class RequestMessage extends MessageItemEvent {
+  final int chatId;
+  final int messageId;
+  final bool isGroupChat;
 
-class DefaultColors {
+  RequestMessage(this.chatId, this.messageId, this.isGroupChat);
+}
 
-  static const Color chatColor = Colors.blue;
-  static const Color mailColor = Colors.indigo;
-  static const Color contactColor = Colors.blueGrey;
-  static const Color profileColor = contactColor;
-
-
-}
\ No newline at end of file
+class MessageLoaded extends MessageItemEvent {}
diff --git a/lib/source/chat/message_item_state.dart b/lib/source/chat/message_item_state.dart
new file mode 100644
index 00000000..d28d21f5
--- /dev/null
+++ b/lib/source/chat/message_item_state.dart
@@ -0,0 +1,124 @@
+/*
+ * OPEN-XCHANGE legal information
+ *
+ * All intellectual property rights in the Software are protected by
+ * international copyright laws.
+ *
+ *
+ * In some countries OX, OX Open-Xchange and open xchange
+ * as well as the corresponding Logos OX Open-Xchange and OX are registered
+ * trademarks of the OX Software GmbH group of companies.
+ * The use of the Logos is not covered by the Mozilla Public License 2.0 (MPL 2.0).
+ * Instead, you are allowed to use these Logos according to the terms and
+ * conditions of the Creative Commons License, Version 2.5, Attribution,
+ * Non-commercial, ShareAlike, and the interpretation of the term
+ * Non-commercial applicable to the aforementioned license is published
+ * on the web site https://www.open-xchange.com/terms-and-conditions/.
+ *
+ * Please make sure that third-party modules and libraries are used
+ * according to their respective licenses.
+ *
+ * Any modifications to this package must retain all copyright notices
+ * of the original copyright holder(s) for the original code used.
+ *
+ * After any such modifications, the original and derivative code shall remain
+ * under the copyright of the copyright holder(s) and/or original author(s) as stated here:
+ * https://www.open-xchange.com/legal/. The contributing author shall be
+ * given Attribution for the derivative code and a license granting use.
+ *
+ * Copyright (C) 2016-2020 OX Software GmbH
+ * Mail: info@open-xchange.com
+ *
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. 
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the Mozilla Public License 2.0
+ * for more details.
+ */
+
+import 'dart:ui';
+
+import 'package:meta/meta.dart';
+import 'package:ox_talk/source/base/bloc_base_state.dart';
+
+abstract class MessageItemState extends BaseState {
+  MessageItemState({
+    @required isLoading,
+    @required isSuccess,
+    @required error,
+  }) : super(isLoading: isLoading, isSuccess: isSuccess, error: error);
+}
+
+class MessageItemStateInitial extends MessageItemState {
+  MessageItemStateInitial()
+      : super(
+    isLoading: false,
+    isSuccess: false,
+    error: '',
+  );
+}
+
+class MessageItemStateLoading extends MessageItemState {
+  MessageItemStateLoading()
+      : super(
+    isLoading: true,
+    isSuccess: false,
+    error: '',
+  );
+}
+
+class MessageItemStateSuccess extends MessageItemState {
+  final String contactName;
+  final String contactAddress;
+  final Color contactColor;
+  final String messageText;
+  final String messageTimestamp;
+  final bool messageIsOutgoing;
+  final bool hasFile;
+  final AttachmentWrapper attachmentWrapper;
+
+  MessageItemStateSuccess({
+    @required this.messageText,
+    @required this.messageIsOutgoing,
+    @required this.messageTimestamp,
+    @required this.hasFile,
+    @required this.attachmentWrapper,
+    this.contactName,
+    this.contactAddress,
+    this.contactColor,
+  }) : super(
+    isLoading: false,
+    isSuccess: true,
+    error: '',
+  );
+}
+
+class MessageItemStateFailure extends MessageItemState {
+  MessageItemStateFailure({@required error})
+      : super(
+    isLoading: false,
+    isSuccess: false,
+    error: error,
+  );
+}
+
+class AttachmentWrapper {
+  final String filename;
+  final String path;
+  final String mimeType;
+  final int size;
+  final int type;
+
+  AttachmentWrapper({
+    @required this.filename,
+    @required this.path,
+    @required this.mimeType,
+    @required this.size,
+    @required this.type,
+  });
+
+}
\ No newline at end of file
diff --git a/lib/source/chat/messages_bloc.dart b/lib/source/chat/messages_bloc.dart
new file mode 100644
index 00000000..9c6ae02a
--- /dev/null
+++ b/lib/source/chat/messages_bloc.dart
@@ -0,0 +1,110 @@
+/*
+ * OPEN-XCHANGE legal information
+ *
+ * All intellectual property rights in the Software are protected by
+ * international copyright laws.
+ *
+ *
+ * In some countries OX, OX Open-Xchange and open xchange
+ * as well as the corresponding Logos OX Open-Xchange and OX are registered
+ * trademarks of the OX Software GmbH group of companies.
+ * The use of the Logos is not covered by the Mozilla Public License 2.0 (MPL 2.0).
+ * Instead, you are allowed to use these Logos according to the terms and
+ * conditions of the Creative Commons License, Version 2.5, Attribution,
+ * Non-commercial, ShareAlike, and the interpretation of the term
+ * Non-commercial applicable to the aforementioned license is published
+ * on the web site https://www.open-xchange.com/terms-and-conditions/.
+ *
+ * Please make sure that third-party modules and libraries are used
+ * according to their respective licenses.
+ *
+ * Any modifications to this package must retain all copyright notices
+ * of the original copyright holder(s) for the original code used.
+ *
+ * After any such modifications, the original and derivative code shall remain
+ * under the copyright of the copyright holder(s) and/or original author(s) as stated here:
+ * https://www.open-xchange.com/legal/. The contributing author shall be
+ * given Attribution for the derivative code and a license granting use.
+ *
+ * Copyright (C) 2016-2020 OX Software GmbH
+ * Mail: info@open-xchange.com
+ *
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the Mozilla Public License 2.0
+ * for more details.
+ */
+
+import 'dart:async';
+
+import 'package:bloc/bloc.dart';
+import 'package:delta_chat_core/delta_chat_core.dart';
+import 'package:ox_talk/source/chat/messages_event.dart';
+import 'package:ox_talk/source/chat/messages_state.dart';
+import 'package:ox_talk/source/data/repository.dart';
+import 'package:ox_talk/source/data/repository_manager.dart';
+
+class MessagesBloc extends Bloc<MessagesEvent, MessagesState> {
+  StreamSubscription streamSubscription;
+  Repository<ChatMsg> messageRepository;
+  int _chatId;
+
+  @override
+  MessagesState get initialState => MessagesStateInitial();
+
+  @override
+  Stream<MessagesState> mapEventToState(MessagesState currentState, MessagesEvent event) async* {
+    if (event is RequestMessages) {
+      yield MessagesStateLoading();
+      try {
+        _chatId = event.chatId;
+        messageRepository = RepositoryManager.get(RepositoryType.chatMessage, _chatId);
+        _setupMessagesListener();
+        _setupMessages();
+      } catch (error) {
+        yield MessagesStateFailure(error: error.toString());
+      }
+    } else if (event is UpdateMessages) {
+      try {
+        _setupMessages();
+      } catch (error) {
+        yield MessagesStateFailure(error: error.toString());
+      }
+    } else if (event is MessagesLoaded) {
+      yield MessagesStateSuccess(
+        messageIds: messageRepository.getAllIds().reversed.toList(growable: false),
+        messageLastUpdateValues: messageRepository.getAllLastUpdateValues(),
+      );
+    }
+  }
+
+  @override
+  void dispose() {
+    super.dispose();
+    messageRepository.removeListener(hashCode, Event.incomingMsg);
+    streamSubscription.cancel();
+  }
+
+  void _setupMessagesListener() async {
+    messageRepository.addListener(hashCode, Event.incomingMsg);
+    streamSubscription = messageRepository.observable.listen((event) => dispatch(UpdateMessages()));
+  }
+
+  void _setupMessages() async {
+    Context context = Context();
+    List<int> messageIds = List.from(await context.getChatMessages(_chatId));
+    messageRepository.putIfAbsent(ids: messageIds);
+    dispatch(MessagesLoaded());
+  }
+
+  void submitMessage(String text) async {
+    Context context = Context();
+    await context.createChatMessage(_chatId, text);
+    dispatch(UpdateMessages());
+  }
+}
diff --git a/lib/source/chat/messages_event.dart b/lib/source/chat/messages_event.dart
new file mode 100644
index 00000000..25acf4d9
--- /dev/null
+++ b/lib/source/chat/messages_event.dart
@@ -0,0 +1,53 @@
+/*
+ * OPEN-XCHANGE legal information
+ *
+ * All intellectual property rights in the Software are protected by
+ * international copyright laws.
+ *
+ *
+ * In some countries OX, OX Open-Xchange and open xchange
+ * as well as the corresponding Logos OX Open-Xchange and OX are registered
+ * trademarks of the OX Software GmbH group of companies.
+ * The use of the Logos is not covered by the Mozilla Public License 2.0 (MPL 2.0).
+ * Instead, you are allowed to use these Logos according to the terms and
+ * conditions of the Creative Commons License, Version 2.5, Attribution,
+ * Non-commercial, ShareAlike, and the interpretation of the term
+ * Non-commercial applicable to the aforementioned license is published
+ * on the web site https://www.open-xchange.com/terms-and-conditions/.
+ *
+ * Please make sure that third-party modules and libraries are used
+ * according to their respective licenses.
+ *
+ * Any modifications to this package must retain all copyright notices
+ * of the original copyright holder(s) for the original code used.
+ *
+ * After any such modifications, the original and derivative code shall remain
+ * under the copyright of the copyright holder(s) and/or original author(s) as stated here:
+ * https://www.open-xchange.com/legal/. The contributing author shall be
+ * given Attribution for the derivative code and a license granting use.
+ *
+ * Copyright (C) 2016-2020 OX Software GmbH
+ * Mail: info@open-xchange.com
+ *
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the Mozilla Public License 2.0
+ * for more details.
+ */
+
+abstract class MessagesEvent {}
+
+class RequestMessages extends MessagesEvent {
+  int chatId;
+
+  RequestMessages(this.chatId);
+}
+
+class UpdateMessages extends MessagesEvent {}
+
+class MessagesLoaded extends MessagesEvent {}
diff --git a/lib/source/chat/messages_state.dart b/lib/source/chat/messages_state.dart
new file mode 100644
index 00000000..22613dad
--- /dev/null
+++ b/lib/source/chat/messages_state.dart
@@ -0,0 +1,92 @@
+/*
+ * OPEN-XCHANGE legal information
+ *
+ * All intellectual property rights in the Software are protected by
+ * international copyright laws.
+ *
+ *
+ * In some countries OX, OX Open-Xchange and open xchange
+ * as well as the corresponding Logos OX Open-Xchange and OX are registered
+ * trademarks of the OX Software GmbH group of companies.
+ * The use of the Logos is not covered by the Mozilla Public License 2.0 (MPL 2.0).
+ * Instead, you are allowed to use these Logos according to the terms and
+ * conditions of the Creative Commons License, Version 2.5, Attribution,
+ * Non-commercial, ShareAlike, and the interpretation of the term
+ * Non-commercial applicable to the aforementioned license is published
+ * on the web site https://www.open-xchange.com/terms-and-conditions/.
+ *
+ * Please make sure that third-party modules and libraries are used
+ * according to their respective licenses.
+ *
+ * Any modifications to this package must retain all copyright notices
+ * of the original copyright holder(s) for the original code used.
+ *
+ * After any such modifications, the original and derivative code shall remain
+ * under the copyright of the copyright holder(s) and/or original author(s) as stated here:
+ * https://www.open-xchange.com/legal/. The contributing author shall be
+ * given Attribution for the derivative code and a license granting use.
+ *
+ * Copyright (C) 2016-2020 OX Software GmbH
+ * Mail: info@open-xchange.com
+ *
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the Mozilla Public License 2.0
+ * for more details.
+ */
+
+import 'package:delta_chat_core/delta_chat_core.dart';
+import 'package:meta/meta.dart';
+import 'package:ox_talk/source/base/bloc_base_state.dart';
+
+abstract class MessagesState extends BaseState {
+  MessagesState({
+    @required isLoading,
+    @required isSuccess,
+    @required error,
+  }) : super(isLoading: isLoading, isSuccess: isSuccess, error: error);
+}
+
+class MessagesStateInitial extends MessagesState {
+  MessagesStateInitial()
+      : super(
+          isLoading: false,
+          isSuccess: false,
+          error: '',
+        );
+}
+
+class MessagesStateLoading extends MessagesState {
+  MessagesStateLoading()
+      : super(
+          isLoading: true,
+          isSuccess: false,
+          error: '',
+        );
+}
+
+class MessagesStateSuccess extends MessagesState {
+  final List<int> messageIds;
+  final List<int> messageLastUpdateValues;
+
+  MessagesStateSuccess({@required this.messageIds, @required this.messageLastUpdateValues})
+      : super(
+          isLoading: false,
+          isSuccess: true,
+          error: '',
+        );
+}
+
+class MessagesStateFailure extends MessagesState {
+  MessagesStateFailure({@required error})
+      : super(
+          isLoading: false,
+          isSuccess: false,
+          error: error,
+        );
+}
diff --git a/lib/source/chatlist/chat_list.dart b/lib/source/chatlist/chat_list.dart
index 47948432..b627940e 100644
--- a/lib/source/chatlist/chat_list.dart
+++ b/lib/source/chatlist/chat_list.dart
@@ -40,33 +40,40 @@
  * for more details.
  */
 
-import 'package:delta_chat_core/delta_chat_core.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:ox_talk/main.dart';
 import 'package:ox_talk/source/base/base_root_child.dart';
+import 'package:ox_talk/source/chatlist/chat_list_bloc.dart';
+import 'package:ox_talk/source/chatlist/chat_list_event.dart';
 import 'package:ox_talk/source/chatlist/chat_list_item.dart';
-import 'package:ox_talk/source/data/chat_repository.dart';
-import 'package:ox_talk/source/data/repository.dart';
+import 'package:ox_talk/source/chatlist/chat_list_state.dart';
 import 'package:ox_talk/source/l10n/localizations.dart';
-import 'package:ox_talk/source/ui/default_colors.dart';
-import 'package:ox_talk/source/ui/dimensions.dart';
+import 'package:ox_talk/source/utils/colors.dart';
+import 'package:ox_talk/source/utils/dimensions.dart';
 
 class ChatListView extends BaseRootChild {
-
   _ChatListState createState() => _ChatListState();
 
   @override
   Color getColor() {
-    return DefaultColors.chatColor;
+    return chatMain;
   }
 
   @override
   FloatingActionButton getFloatingActionButton(BuildContext context) {
     return FloatingActionButton(
       child: new Icon(Icons.create),
-      onPressed: () {},
+      onPressed: () {
+        _showCreateChatView(context);
+      },
     );
   }
 
+  _showCreateChatView(BuildContext context) {
+    Navigator.pushNamed(context, OxTalkApp.ROUTES_CHAT_CREATE);
+  }
+
   @override
   String getTitle(BuildContext context) {
     return AppLocalizations.of(context).chatTitle;
@@ -81,70 +88,44 @@ class ChatListView extends BaseRootChild {
   IconData getNavigationIcon() {
     return Icons.chat;
   }
-
 }
 
 class _ChatListState extends State<ChatListView> {
-  Repository<Chat> chatRepository;
-  List<int> chatIds = List();
-  int _listenerId;
+  ChatListBloc _chatListBloc = ChatListBloc();
 
   @override
   void initState() {
     super.initState();
-    setupChatLists();
-    setupChatListListener();
+    _chatListBloc.dispatch(RequestChatList());
   }
 
   @override
   Widget build(BuildContext context) {
+    return BlocBuilder(
+      bloc: _chatListBloc,
+      builder: (context, state) {
+        if (state is ChatListStateSuccess) {
+          return buildListViewItems(state.chatIds, state.chatLastUpdateValues);
+        } else if (state is! ChatListStateFailure) {
+          return Center(
+            child: CircularProgressIndicator(),
+          );
+        } else {
+          return Icon(Icons.error);
+        }
+      },
+    );
+  }
+
+  Widget buildListViewItems(List<int> chatIds, List<int> chatLastUpdateValues) {
     return ListView.builder(
-      padding: EdgeInsets.all(Dimensions.listItemPadding),
+      padding: EdgeInsets.all(listItemPadding),
       itemCount: chatIds.length,
       itemBuilder: (BuildContext context, int index) {
         var chatId = chatIds[index];
-        var _chat = chatRepository.get(chatId);
-        return ChatListItem(_chat);
+        var key = "$chatId-${chatLastUpdateValues[index]}";
+        return ChatListItem(chatId, key);
       },
     );
   }
-
-  void setupChatLists() async {
-    ChatList chatList = ChatList();
-    int chatCount = await chatList.getChatCnt();
-
-    chatRepository = ChatRepository(Chat.getCreator());
-    if (chatCount > 0) {
-      for (int i = 0; i < chatCount; i++) {
-        int chatId = await chatList.getChat(i);
-        chatIds.add(chatId);
-      }
-    }
-
-    chatRepository.putIfAbsent(ids: chatIds);
-
-    setState(() {});
-  }
-
-  void setupChatListListener() async {
-    DeltaChatCore core = DeltaChatCore();
-    _listenerId = await core.listen(Dc.eventChatModified, _success);
-  }
-
-  void _success(Event event) {
-    chatIds.clear();
-    setState(() {});
-    setupChatLists();
-  }
-
-  @override
-  void dispose() {
-    super.dispose();
-    tearDownChatListListener();
-  }
-
-  void tearDownChatListListener() {
-    DeltaChatCore core = DeltaChatCore();
-    core.removeListener(Dc.eventChatModified, _listenerId);
-  }
 }
diff --git a/lib/source/chatlist/chat_list_bloc.dart b/lib/source/chatlist/chat_list_bloc.dart
new file mode 100644
index 00000000..3d4b316e
--- /dev/null
+++ b/lib/source/chatlist/chat_list_bloc.dart
@@ -0,0 +1,101 @@
+/*
+ * OPEN-XCHANGE legal information
+ *
+ * All intellectual property rights in the Software are protected by
+ * international copyright laws.
+ *
+ *
+ * In some countries OX, OX Open-Xchange and open xchange
+ * as well as the corresponding Logos OX Open-Xchange and OX are registered
+ * trademarks of the OX Software GmbH group of companies.
+ * The use of the Logos is not covered by the Mozilla Public License 2.0 (MPL 2.0).
+ * Instead, you are allowed to use these Logos according to the terms and
+ * conditions of the Creative Commons License, Version 2.5, Attribution,
+ * Non-commercial, ShareAlike, and the interpretation of the term
+ * Non-commercial applicable to the aforementioned license is published
+ * on the web site https://www.open-xchange.com/terms-and-conditions/.
+ *
+ * Please make sure that third-party modules and libraries are used
+ * according to their respective licenses.
+ *
+ * Any modifications to this package must retain all copyright notices
+ * of the original copyright holder(s) for the original code used.
+ *
+ * After any such modifications, the original and derivative code shall remain
+ * under the copyright of the copyright holder(s) and/or original author(s) as stated here:
+ * https://www.open-xchange.com/legal/. The contributing author shall be
+ * given Attribution for the derivative code and a license granting use.
+ *
+ * Copyright (C) 2016-2020 OX Software GmbH
+ * Mail: info@open-xchange.com
+ *
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the Mozilla Public License 2.0
+ * for more details.
+ */
+
+import 'dart:async';
+
+import 'package:bloc/bloc.dart';
+import 'package:delta_chat_core/delta_chat_core.dart';
+import 'package:ox_talk/source/chatlist/chat_list_event.dart';
+import 'package:ox_talk/source/chatlist/chat_list_state.dart';
+import 'package:ox_talk/source/data/repository.dart';
+import 'package:ox_talk/source/data/repository_manager.dart';
+class ChatListBloc extends Bloc<ChatListEvent, ChatListState> {
+  final Repository<ChatList> chatListRepository = RepositoryManager.get(RepositoryType.chatList);
+  final Repository<Chat> chatRepository = RepositoryManager.get(RepositoryType.chat);
+  StreamSubscription streamSubscription;
+
+  @override
+  ChatListState get initialState => ChatListStateInitial();
+
+  @override
+  Stream<ChatListState> mapEventToState(ChatListState currentState, ChatListEvent event) async*{
+    if (event is RequestChatList) {
+      yield ChatListStateLoading();
+      try {
+        setupChatListListener();
+        setupChatList();
+      } catch (error) {
+        yield ChatListStateFailure(error: error.toString());
+      }
+    }else if(event is ChatListModified){
+      yield ChatListStateSuccess(chatIds: chatRepository.getAllIds(), chatLastUpdateValues: chatRepository.getAllLastUpdateValues());
+    }
+  }
+
+  @override
+  void dispose() {
+    super.dispose();
+    chatListRepository.removeListener(hashCode, Event.chatModified);
+    streamSubscription.cancel();
+  }
+
+  void setupChatList() async{
+    ChatList chatList = ChatList();
+    int chatCount = await chatList.getChatCnt();
+    List<int> chatIds = List();
+
+    if (chatCount > 0) {
+      for (int i = 0; i < chatCount; i++) {
+        int chatId = await chatList.getChat(i);
+        chatIds.add(chatId);
+      }
+    }
+
+    chatRepository.putIfAbsent(ids: chatIds);
+    dispatch(ChatListModified());
+  }
+
+  void setupChatListListener() {
+    chatListRepository.addListener(hashCode, Event.chatModified);
+    streamSubscription = chatListRepository.observable.listen((event) => dispatch(ChatListModified()));
+  }
+}
\ No newline at end of file
diff --git a/lib/source/chatlist/chat_list_event.dart b/lib/source/chatlist/chat_list_event.dart
new file mode 100644
index 00000000..5feae1c1
--- /dev/null
+++ b/lib/source/chatlist/chat_list_event.dart
@@ -0,0 +1,47 @@
+/*
+ * OPEN-XCHANGE legal information
+ *
+ * All intellectual property rights in the Software are protected by
+ * international copyright laws.
+ *
+ *
+ * In some countries OX, OX Open-Xchange and open xchange
+ * as well as the corresponding Logos OX Open-Xchange and OX are registered
+ * trademarks of the OX Software GmbH group of companies.
+ * The use of the Logos is not covered by the Mozilla Public License 2.0 (MPL 2.0).
+ * Instead, you are allowed to use these Logos according to the terms and
+ * conditions of the Creative Commons License, Version 2.5, Attribution,
+ * Non-commercial, ShareAlike, and the interpretation of the term
+ * Non-commercial applicable to the aforementioned license is published
+ * on the web site https://www.open-xchange.com/terms-and-conditions/.
+ *
+ * Please make sure that third-party modules and libraries are used
+ * according to their respective licenses.
+ *
+ * Any modifications to this package must retain all copyright notices
+ * of the original copyright holder(s) for the original code used.
+ *
+ * After any such modifications, the original and derivative code shall remain
+ * under the copyright of the copyright holder(s) and/or original author(s) as stated here:
+ * https://www.open-xchange.com/legal/. The contributing author shall be
+ * given Attribution for the derivative code and a license granting use.
+ *
+ * Copyright (C) 2016-2020 OX Software GmbH
+ * Mail: info@open-xchange.com
+ *
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the Mozilla Public License 2.0
+ * for more details.
+ */
+
+abstract class ChatListEvent {}
+
+class RequestChatList extends ChatListEvent {}
+
+class ChatListModified extends ChatListEvent {}
\ No newline at end of file
diff --git a/lib/source/chatlist/chat_list_item.dart b/lib/source/chatlist/chat_list_item.dart
index c67fa300..8871269e 100644
--- a/lib/source/chatlist/chat_list_item.dart
+++ b/lib/source/chatlist/chat_list_item.dart
@@ -40,95 +40,70 @@
  * for more details.
  */
 
-import 'package:delta_chat_core/delta_chat_core.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:ox_talk/source/chat/chat.dart';
-import 'package:ox_talk/source/ui/dimensions.dart';
+import 'package:ox_talk/source/chat/chat_bloc.dart';
+import 'package:ox_talk/source/chat/chat_event.dart';
+import 'package:ox_talk/source/chat/chat_state.dart';
+import 'package:ox_talk/source/widgets/avatar_list_item.dart';
+import 'package:ox_talk/source/utils/colors.dart';
 
-class ChatListItem extends StatefulWidget
-{
-  final Chat _chat;
+class ChatListItem extends StatefulWidget {
+  final int _chatId;
 
-  ChatListItem(this._chat);
+  ChatListItem(this._chatId, key) : super(key: Key(key));
 
   @override
   _ChatListItemState createState() => _ChatListItemState();
 }
 
-class _ChatListItemState  extends State<ChatListItem>
-{
-  String _name;
-  String _subtitle;
+class _ChatListItemState extends State<ChatListItem> {
+  ChatBloc _chatBloc = ChatBloc();
 
   @override
   void initState() {
     super.initState();
-    setupChatItem();
-  }
-
-  void setupChatItem() async {
-    _name = await widget._chat.getName();
-    _subtitle = await widget._chat.getSubtitle();
-    setState(() {});
+    _chatBloc.dispatch(RequestChat(widget._chatId));
   }
 
   @override
   Widget build(BuildContext context) {
-  return GestureDetector(
-    onTap:() => chatItemTapped(),
-    child: Padding(
-    padding: const EdgeInsets.only(top: Dimensions.listItemPaddingSmall),
-      child: Row(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: <Widget>[
-          CircleAvatar(
-            radius: 24.0,
-            child: Text(getInitial()),
-          ),
-          Expanded(
-            child: Padding(
-              padding: EdgeInsets.symmetric(horizontal: Dimensions.listItemPadding),
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: <Widget>[
-                  Row(
-                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                    children: <Widget>[
-                      Expanded(
-                        child: _name != null ? Text(
-                          _name,
-                          maxLines: 1,
-                          overflow: TextOverflow.ellipsis,
-                          style: TextStyle(fontWeight: FontWeight.w500, fontSize: 18.0),
-                        ) : Container(),
-                      ),
-                    ],
-                  ),
-                  _subtitle != null ?
-                  Text(_subtitle)
-                      : Container(),
-                  Divider(),
-                ],
-              ),
-            ),
-          )
-        ],
-      ),
-    )
-  );
-  }
-
-  String getInitial() {
-    if (_name != null && _name.isNotEmpty) {
-      return _name.substring(0, 1);
-    }
-    return "";
+    return BlocBuilder(
+      bloc: _chatBloc,
+      builder: (context, state) {
+        String name;
+        String subTitle;
+        Color color;
+        if (state is ChatStateSuccess) {
+          name = state.name;
+          subTitle = state.subTitle;
+          color = state.color;
+        } else {
+          name = "";
+          subTitle = "";
+        }
+        return AvatarListItem(
+          title: name,
+          subTitle: subTitle,
+          color: color,
+          subTitleIcon: _chatBloc.isGroup
+              ? Icon(
+                  Icons.group,
+                  size: 18,
+                )
+              : Container(),
+          onTap: chatItemTapped,
+        );
+      },
+    );
+    /*;*/
   }
 
-  chatItemTapped() {
+  chatItemTapped(String name, String subtitle) {
     Navigator.push(
       context,
-      MaterialPageRoute(builder: (context) => ChatScreen(widget._chat)),
+      MaterialPageRoute(builder: (context) => ChatScreen(widget._chatId)),
     );
   }
-}
\ No newline at end of file
+}
diff --git a/lib/source/chatlist/chat_list_state.dart b/lib/source/chatlist/chat_list_state.dart
new file mode 100644
index 00000000..7c6aeb48
--- /dev/null
+++ b/lib/source/chatlist/chat_list_state.dart
@@ -0,0 +1,101 @@
+/*
+ * OPEN-XCHANGE legal information
+ *
+ * All intellectual property rights in the Software are protected by
+ * international copyright laws.
+ *
+ *
+ * In some countries OX, OX Open-Xchange and open xchange
+ * as well as the corresponding Logos OX Open-Xchange and OX are registered
+ * trademarks of the OX Software GmbH group of companies.
+ * The use of the Logos is not covered by the Mozilla Public License 2.0 (MPL 2.0).
+ * Instead, you are allowed to use these Logos according to the terms and
+ * conditions of the Creative Commons License, Version 2.5, Attribution,
+ * Non-commercial, ShareAlike, and the interpretation of the term
+ * Non-commercial applicable to the aforementioned license is published
+ * on the web site https://www.open-xchange.com/terms-and-conditions/.
+ *
+ * Please make sure that third-party modules and libraries are used
+ * according to their respective licenses.
+ *
+ * Any modifications to this package must retain all copyright notices
+ * of the original copyright holder(s) for the original code used.
+ *
+ * After any such modifications, the original and derivative code shall remain
+ * under the copyright of the copyright holder(s) and/or original author(s) as stated here:
+ * https://www.open-xchange.com/legal/. The contributing author shall be
+ * given Attribution for the derivative code and a license granting use.
+ *
+ * Copyright (C) 2016-2020 OX Software GmbH
+ * Mail: info@open-xchange.com
+ *
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the Mozilla Public License 2.0
+ * for more details.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:ox_talk/source/base/bloc_base_state.dart';
+
+abstract class ChatListState extends BaseState {
+  final List<int> chatIds;
+  final List<int> chatLastUpdateValues;
+
+  ChatListState({
+    @required isLoading,
+    @required isSuccess,
+    @required error,
+    @required this.chatIds,
+    @required this.chatLastUpdateValues,
+  }) : super(isLoading: isLoading, isSuccess: isSuccess, error: error);
+}
+
+class ChatListStateInitial extends ChatListState {
+  ChatListStateInitial()
+      : super(
+    isLoading: false,
+    isSuccess: false,
+    error: '',
+    chatIds: null,
+    chatLastUpdateValues: null,
+  );
+}
+
+class ChatListStateLoading extends ChatListState {
+  ChatListStateLoading()
+      : super(
+    isLoading: true,
+    isSuccess: false,
+    error: '',
+    chatIds: List(),
+    chatLastUpdateValues: List(),
+  );
+}
+
+class ChatListStateSuccess extends ChatListState {
+  ChatListStateSuccess({@required List<int> chatIds, @required List<int> chatLastUpdateValues})
+      : super(
+    isLoading: false,
+    isSuccess: true,
+    error: '',
+    chatIds: chatIds,
+    chatLastUpdateValues: chatLastUpdateValues,
+  );
+}
+
+class ChatListStateFailure extends ChatListState {
+  ChatListStateFailure({@required error})
+      : super(
+    isLoading: false,
+    isSuccess: false,
+    error: error,
+    chatIds: null,
+    chatLastUpdateValues: null,
+  );
+}
\ No newline at end of file
diff --git a/lib/source/chatlist/create_chat.dart b/lib/source/chatlist/create_chat.dart
new file mode 100644
index 00000000..9438b640
--- /dev/null
+++ b/lib/source/chatlist/create_chat.dart
@@ -0,0 +1,151 @@
+/*
+ * OPEN-XCHANGE legal information
+ *
+ * All intellectual property rights in the Software are protected by
+ * international copyright laws.
+ *
+ *
+ * In some countries OX, OX Open-Xchange and open xchange
+ * as well as the corresponding Logos OX Open-Xchange and OX are registered
+ * trademarks of the OX Software GmbH group of companies.
+ * The use of the Logos is not covered by the Mozilla Public License 2.0 (MPL 2.0).
+ * Instead, you are allowed to use these Logos according to the terms and
+ * conditions of the Creative Commons License, Version 2.5, Attribution,
+ * Non-commercial, ShareAlike, and the interpretation of the term
+ * Non-commercial applicable to the aforementioned license is published
+ * on the web site https://www.open-xchange.com/terms-and-conditions/.
+ *
+ * Please make sure that third-party modules and libraries are used
+ * according to their respective licenses.
+ *
+ * Any modifications to this package must retain all copyright notices
+ * of the original copyright holder(s) for the original code used.
+ *
+ * After any such modifications, the original and derivative code shall remain
+ * under the copyright of the copyright holder(s) and/or original author(s) as stated here:
+ * https://www.open-xchange.com/legal/. The contributing author shall be
+ * given Attribution for the derivative code and a license granting use.
+ *
+ * Copyright (C) 2016-2020 OX Software GmbH
+ * Mail: info@open-xchange.com
+ *
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the Mozilla Public License 2.0
+ * for more details.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:ox_talk/source/chatlist/create_group_chat.dart';
+import 'package:ox_talk/source/contact/contact_change.dart';
+import 'package:ox_talk/source/contact/contact_item.dart';
+import 'package:ox_talk/source/contact/contact_list_bloc.dart';
+import 'package:ox_talk/source/contact/contact_list_event.dart';
+import 'package:ox_talk/source/contact/contact_list_state.dart';
+import 'package:ox_talk/source/l10n/localizations.dart';
+import 'package:ox_talk/source/utils/colors.dart';
+import 'package:ox_talk/source/utils/dimensions.dart';
+
+class CreateChat extends StatefulWidget {
+  @override
+  _CreateChatState createState() => _CreateChatState();
+}
+
+class _CreateChatState extends State<CreateChat> {
+  ContactListBloc _contactListBloc = ContactListBloc();
+
+  @override
+  void initState(){
+    super.initState();
+    _contactListBloc.dispatch(RequestContacts());
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+        appBar: AppBar(
+          leading: new IconButton(
+            icon: new Icon(Icons.close),
+            onPressed: () => Navigator.of(context).pop(),
+          ),
+          backgroundColor: chatMain,
+          title: Text(AppLocalizations.of(context).createGroupTitle),
+        ),
+        body: buildForm()
+    );
+  }
+
+  @override
+  Widget buildForm() {
+    return BlocBuilder(
+      bloc: _contactListBloc,
+      builder: (context, state) {
+        if (state is ContactListStateSuccess) {
+          return buildListViewItems(state.contactIds, state.contactLastUpdateValues);
+        } else if (state is! ContactListStateFailure) {
+          return Center(
+            child: CircularProgressIndicator(),
+          );
+        } else {
+          return Icon(Icons.error);
+        }
+      },
+    );
+  }
+
+  Widget buildListViewItems(List<int> contactIds, List<int> contactLastUpdateValues) {
+    return Column(
+      children: <Widget>[
+        SizedBox(
+          width: double.infinity,
+          child: FlatButton(
+            onPressed: () => newContactTapped(),
+            child: Text(AppLocalizations.of(context).createChatNewContactButtonText)
+          ),
+        ),
+        SizedBox(
+          width: double.infinity,
+          child: FlatButton(
+            onPressed: () => createGroupTapped(),
+            child: Text(AppLocalizations.of(context).createChatCreateGroupButtonText)
+          ),
+        ),
+        Flexible(
+          child: ListView.builder(
+            padding: EdgeInsets.all(listItemPadding),
+            itemCount: contactIds.length,
+            itemBuilder: (BuildContext context, int index) {
+              var contactId = contactIds[index];
+              var key = "$contactId-${contactLastUpdateValues[index]}";
+              return ContactItem(contactId, true, key);
+            }
+          ),
+        )
+      ],
+    );
+  }
+
+  newContactTapped(){
+    Navigator.push(
+      context,
+      MaterialPageRoute(
+        builder: (context) => ContactChange(contactAction: ContactAction.add, createChat: true,)
+      )
+    );
+  }
+
+  createGroupTapped() {
+    Navigator.push(
+        context,
+        MaterialPageRoute(
+            builder: (context) => CreateGroupChat()
+        )
+    );
+  }
+}
diff --git a/lib/source/chatlist/create_group_chat.dart b/lib/source/chatlist/create_group_chat.dart
new file mode 100644
index 00000000..4dce3084
--- /dev/null
+++ b/lib/source/chatlist/create_group_chat.dart
@@ -0,0 +1,172 @@
+/*
+ * OPEN-XCHANGE legal information
+ *
+ * All intellectual property rights in the Software are protected by
+ * international copyright laws.
+ *
+ *
+ * In some countries OX, OX Open-Xchange and open xchange
+ * as well as the corresponding Logos OX Open-Xchange and OX are registered
+ * trademarks of the OX Software GmbH group of companies.
+ * The use of the Logos is not covered by the Mozilla Public License 2.0 (MPL 2.0).
+ * Instead, you are allowed to use these Logos according to the terms and
+ * conditions of the Creative Commons License, Version 2.5, Attribution,
+ * Non-commercial, ShareAlike, and the interpretation of the term
+ * Non-commercial applicable to the aforementioned license is published
+ * on the web site https://www.open-xchange.com/terms-and-conditions/.
+ *
+ * Please make sure that third-party modules and libraries are used
+ * according to their respective licenses.
+ *
+ * Any modifications to this package must retain all copyright notices
+ * of the original copyright holder(s) for the original code used.
+ *
+ * After any such modifications, the original and derivative code shall remain
+ * under the copyright of the copyright holder(s) and/or original author(s) as stated here:
+ * https://www.open-xchange.com/legal/. The contributing author shall be
+ * given Attribution for the derivative code and a license granting use.
+ *
+ * Copyright (C) 2016-2020 OX Software GmbH
+ * Mail: info@open-xchange.com
+ *
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the Mozilla Public License 2.0
+ * for more details.
+ */
+
+import 'package:delta_chat_core/delta_chat_core.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:ox_talk/source/chat/chat.dart';
+import 'package:ox_talk/source/contact/contact_list_bloc.dart';
+import 'package:ox_talk/source/contact/contact_list_event.dart';
+import 'package:ox_talk/source/contact/contact_list_state.dart';
+import 'package:ox_talk/source/contact/selectable_contact_item.dart';
+import 'package:ox_talk/source/data/chat_repository.dart';
+import 'package:ox_talk/source/data/repository.dart';
+import 'package:ox_talk/source/utils/colors.dart';
+import 'package:ox_talk/source/utils/dimensions.dart';
+import 'package:ox_talk/source/l10n/localizations.dart';
+
+class CreateGroupChat extends StatefulWidget {
+  @override
+  _CreateGroupChatState createState() => _CreateGroupChatState();
+}
+
+class _CreateGroupChatState extends State<CreateGroupChat> {
+  ContactListBloc _contactListBloc = ContactListBloc();
+  TextEditingController _controller = new TextEditingController();
+  GlobalKey<FormState> _formKey = GlobalKey();
+  List<int> selectedItems = new List();
+  Repository<Chat> chatRepository;
+
+  @override
+  void initState(){
+    super.initState();
+    _contactListBloc.dispatch(RequestContacts());
+    chatRepository = ChatRepository(Chat.getCreator());
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+        appBar: AppBar(
+          leading: new IconButton(
+            icon: new Icon(Icons.close),
+            onPressed: () => Navigator.of(context).pop(),
+          ),
+          backgroundColor: chatMain,
+          title: Text(AppLocalizations.of(context).createGroupTitle),
+          actions: <Widget>[
+            IconButton(
+              icon: Icon(Icons.check),
+              onPressed: () => onSubmit(),
+            )
+          ],
+        ),
+        body: buildForm()
+    );
+  }
+
+  @override
+  Widget buildForm() {
+    return BlocBuilder(
+      bloc: _contactListBloc,
+      builder: (context, state) {
+        if (state is ContactListStateSuccess) {
+          return buildCompleteForm(state.contactIds, state.contactLastUpdateValues);
+        } else if (state is! ContactListStateFailure) {
+          return Center(
+            child: CircularProgressIndicator(),
+          );
+        } else {
+          return Icon(Icons.error);
+        }
+      },
+    );
+  }
+
+  Widget buildCompleteForm(List<int> contactIds, List<int> contactLastUpdateValues) {
+    return Column(
+      children: <Widget>[
+        Padding(
+          padding: EdgeInsets.only(left: defaultBorderPadding, top: 12.0, right: defaultBorderPadding),
+          child: Form(
+            key: _formKey,
+            child: TextFormField(
+              decoration: InputDecoration(
+                  labelText: AppLocalizations.of(context).createGroupTextFieldLabel,
+                  hintText: AppLocalizations.of(context).createGroupTextFieldHint
+              ),
+              validator: (value) {
+                if (value.isEmpty){
+                  return AppLocalizations.of(context).validatableTextFormFieldHintEmptyString;
+                }
+              },
+              controller: _controller,
+            )
+          ,)
+        ),
+        Padding(padding: EdgeInsets.only(top: 12.0)),
+        Text(AppLocalizations.of(context).createGroupSelectContactsInfo),
+        Flexible(
+          child: ListView.builder(
+            padding: EdgeInsets.all(listItemPadding),
+            itemCount: contactIds.length,
+            itemBuilder: (BuildContext context, int index) {
+              var contactId = contactIds[index];
+              var key = "$contactId-${contactLastUpdateValues[index]}";
+              return SelectableContactItem(contactId, itemTapped, key);
+            }
+          )
+        )
+      ],
+    );
+  }
+
+  itemTapped(int id){
+    if(selectedItems.contains(id)){
+      selectedItems.remove(id);
+    }else{
+      selectedItems.add(id);
+    }
+  }
+
+  onSubmit() async{
+    if(_formKey.currentState.validate()){
+      Context coreContext = Context();
+      int chatId = await coreContext.createGroupChat(false, _controller.text);
+      for(int i = 0; i < selectedItems.length; i++){
+        coreContext.addContactToChat(chatId, selectedItems[i]);
+      }
+      chatRepository.putIfAbsent(id: chatId);
+      Navigator.pushAndRemoveUntil(context, MaterialPageRoute(builder: (context) => ChatScreen(chatId)), ModalRoute.withName('/'));
+    }
+  }
+}
diff --git a/lib/source/contact/contact_change.dart b/lib/source/contact/contact_change.dart
index 83e5de0d..3f6bf33d 100644
--- a/lib/source/contact/contact_change.dart
+++ b/lib/source/contact/contact_change.dart
@@ -40,23 +40,35 @@
  * for more details.
  */
 
+import 'package:delta_chat_core/delta_chat_core.dart';
 import 'package:flutter/material.dart';
-import 'package:fluttertoast/fluttertoast.dart';
+import 'package:ox_talk/source/chat/chat.dart';
 import 'package:ox_talk/source/contact/contact_change_bloc.dart';
 import 'package:ox_talk/source/contact/contact_change_event.dart';
 import 'package:ox_talk/source/contact/contact_change_state.dart';
-import 'package:ox_talk/source/form/validatable_text_form_field.dart';
-import 'package:ox_talk/source/ui/default_colors.dart';
-import 'package:ox_talk/source/error/error.dart';
+import 'package:ox_talk/source/data/chat_repository.dart';
+import 'package:ox_talk/source/data/repository.dart';
+import 'package:ox_talk/source/utils/error.dart';
+import 'package:ox_talk/source/widgets/validatable_text_form_field.dart';
+import 'package:ox_talk/source/l10n/localizations.dart';
+import 'package:ox_talk/source/utils/colors.dart';
+import 'package:ox_talk/source/utils/toast.dart';
 import 'package:rxdart/rxdart.dart';
 
+enum ContactAction {
+  add,
+  edit,
+  delete,
+}
+
 class ContactChange extends StatefulWidget {
-  final bool add;
+  final ContactAction contactAction;
   final int id;
   final String name;
   final String email;
+  final bool createChat;
 
-  ContactChange({@required this.add, this.id, this.name, this.email});
+  ContactChange({@required this.contactAction, this.id, this.name, this.email, this.createChat = false});
 
   @override
   _ContactChangeState createState() => _ContactChangeState();
@@ -64,67 +76,79 @@ class ContactChange extends StatefulWidget {
 
 class _ContactChangeState extends State<ContactChange> {
   GlobalKey<FormState> _formKey = GlobalKey();
-  ValidatableTextFormField _nameField = ValidatableTextFormField("Name", "Enter a name for the contact");
+  ValidatableTextFormField _nameField = ValidatableTextFormField(
+    (context) => AppLocalizations.of(context).name,
+    hintText: (context) => AppLocalizations.of(context).contactChangeNameHint,
+  );
   ValidatableTextFormField _emailField;
 
   String title;
   String deleteButton;
-  String editToast;
+  String changeToast;
   String deleteToast;
   String deleteFailedToast;
 
   ContactChangeBloc _contactChangeBloc = ContactChangeBloc();
 
+  Repository<Chat> chatRepository;
+
   @override
   void initState() {
     super.initState();
-    if (widget.add) {
-      title = "Add Contact";
-      editToast = "Contact successfully added";
-      _emailField = ValidatableTextFormField("Email address", "Enter a valid email address",
-          textFormType: TextFormType.email, inputType: TextInputType.emailAddress);
-    } else {
-      deleteButton = "Delete Contact";
-      title = "Edit Name";
-      editToast = "Contact successfully edited";
-      deleteToast = "Contact successfully deleted";
-      deleteFailedToast = "Could not delete contact. Please delete active chats first.";
-      _nameField.controller.text = widget.name != null ? widget.name : "";
+    if (widget.contactAction == ContactAction.add) {
+      _emailField = ValidatableTextFormField(
+        (context) => AppLocalizations.of(context).emailAddress,
+        textFormType: TextFormType.email,
+        inputType: TextInputType.emailAddress,
+      );
     }
     final contactAddedObservable = new Observable<ContactChangeState>(_contactChangeBloc.state);
     contactAddedObservable.listen((state) => handleContactChanged(state));
+    chatRepository = ChatRepository(Chat.getCreator());
   }
 
-  handleContactChanged(ContactChangeState state) {
+  handleContactChanged(ContactChangeState state) async {
     if (state is ContactChangeStateSuccess) {
-      if (state.delete) {
-        _showToast(deleteToast);
+      if (!widget.createChat) {
+        if (state.delete) {
+          showToast(deleteToast);
+        } else {
+          showToast(changeToast);
+        }
+        Navigator.pop(context);
       } else {
-        _showToast(editToast);
+        if (state.id != null) {
+          Context coreContext = Context();
+          var chatId = await coreContext.createChatByContactId(state.id);
+          chatRepository.putIfAbsent(id: chatId);
+          Navigator.pushAndRemoveUntil(context, MaterialPageRoute(builder: (context) => ChatScreen(chatId)), ModalRoute.withName('/'));
+        }
       }
-      Navigator.pop(context);
-    } else if (state is ContactChangeStateFailure && state.error == Error.contactDelete) {
-      _showToast(deleteFailedToast);
+    } else if (state is ContactChangeStateFailure && state.error == contactDelete) {
+      showToast(deleteFailedToast);
     }
   }
 
-  _showToast(String message) {
-    Fluttertoast.showToast(
-      msg: message,
-      toastLength: Toast.LENGTH_LONG,
-      timeInSecForIos: 4,
-    );
-  }
-
   @override
   Widget build(BuildContext context) {
+    if (widget.contactAction == ContactAction.add) {
+      title = AppLocalizations.of(context).contactChangeAddTitle;
+      changeToast = AppLocalizations.of(context).contactChangeAddToast;
+    } else {
+      deleteButton = AppLocalizations.of(context).contactChangeDeleteTitle;
+      title = AppLocalizations.of(context).contactChangeEditTitle;
+      changeToast = AppLocalizations.of(context).contactChangeEditToast;
+      deleteToast = AppLocalizations.of(context).contactChangeDeleteToast;
+      deleteFailedToast = AppLocalizations.of(context).contactChangeDeleteFailedToast;
+      _nameField.controller.text = widget.name != null ? widget.name : "";
+    }
     return Scaffold(
         appBar: AppBar(
           leading: new IconButton(
             icon: new Icon(Icons.close),
             onPressed: () => Navigator.of(context).pop(),
           ),
-          backgroundColor: DefaultColors.contactColor,
+          backgroundColor: contactMain,
           title: Text(title),
           actions: <Widget>[
             IconButton(
@@ -138,7 +162,7 @@ class _ContactChangeState extends State<ContactChange> {
 
   onSubmit() {
     if (_formKey.currentState.validate()) {
-      _contactChangeBloc.dispatch(ChangeContact(getName(), getEmail(), widget.add));
+      _contactChangeBloc.dispatch(ChangeContact(getName(), getEmail(), widget.contactAction));
     }
   }
 
@@ -155,7 +179,7 @@ class _ContactChangeState extends State<ContactChange> {
                 padding: const EdgeInsets.only(bottom: 16.0, top: 8.0),
                 child: Column(
                   children: <Widget>[
-                    !widget.add
+                    widget.contactAction != ContactAction.add
                         ? Padding(
                             padding: const EdgeInsets.only(top: 8.0, bottom: 4.0),
                             child: Row(
@@ -181,7 +205,7 @@ class _ContactChangeState extends State<ContactChange> {
                         Expanded(child: _nameField),
                       ],
                     ),
-                    widget.add
+                    widget.contactAction == ContactAction.add
                         ? Row(
                             children: <Widget>[
                               Icon(Icons.mail),
@@ -195,7 +219,7 @@ class _ContactChangeState extends State<ContactChange> {
                   ],
                 ),
               ),
-              !widget.add
+              widget.contactAction != ContactAction.add
                   ? Center(
                       child: OutlineButton(
                         highlightedBorderColor: Theme.of(context).errorColor,
@@ -218,17 +242,17 @@ class _ContactChangeState extends State<ContactChange> {
         context: context,
         builder: (context) {
           return AlertDialog(
-            title: Text("Delete contact"),
-            content: new Text("Do you really want to delete ${getEmail()} (${getName()})?"),
+            title: Text(AppLocalizations.of(context).contactChangeDeleteTitle),
+            content: new Text(AppLocalizations.of(context).contactChangeDeleteDialogContent(getEmail(), getName())),
             actions: <Widget>[
               new FlatButton(
-                child: new Text("No"),
+                child: new Text(AppLocalizations.of(context).no),
                 onPressed: () {
                   Navigator.of(context).pop();
                 },
               ),
               new FlatButton(
-                child: new Text("Delete"),
+                child: new Text(AppLocalizations.of(context).delete),
                 onPressed: () {
                   _contactChangeBloc.dispatch(DeleteContact(widget.id));
                   Navigator.of(context).pop();
@@ -241,5 +265,5 @@ class _ContactChangeState extends State<ContactChange> {
 
   String getName() => _nameField.controller.text;
 
-  String getEmail() => widget.add ? _emailField.controller.text : widget.email;
+  String getEmail() => widget.contactAction == ContactAction.add ? _emailField.controller.text : widget.email;
 }
diff --git a/lib/source/contact/contact_change_bloc.dart b/lib/source/contact/contact_change_bloc.dart
index 3dc4b85c..9785ff24 100644
--- a/lib/source/contact/contact_change_bloc.dart
+++ b/lib/source/contact/contact_change_bloc.dart
@@ -44,11 +44,12 @@ import 'dart:async';
 
 import 'package:bloc/bloc.dart';
 import 'package:delta_chat_core/delta_chat_core.dart';
+import 'package:ox_talk/source/contact/contact_change.dart';
 import 'package:ox_talk/source/contact/contact_change_event.dart';
 import 'package:ox_talk/source/contact/contact_change_state.dart';
 import 'package:ox_talk/source/data/repository.dart';
 import 'package:ox_talk/source/data/repository_manager.dart';
-import 'package:ox_talk/source/error/error.dart';
+import 'package:ox_talk/source/utils/error.dart';
 
 class ContactChangeBloc extends Bloc<ContactChangeEvent, ContactChangeState> {
   final Repository<Contact> contactRepository = RepositoryManager.get(RepositoryType.contact);
@@ -61,28 +62,28 @@ class ContactChangeBloc extends Bloc<ContactChangeEvent, ContactChangeState> {
     if (event is ChangeContact) {
       yield ContactChangeStateLoading();
       try {
-        _changeContact(event.name, event.mail, event.add);
+        _changeContact(event.name, event.mail, event.contactAction);
       } catch (error) {
         yield ContactChangeStateFailure(error: error.toString());
       }
     } else if (event is ContactAdded) {
-      yield ContactChangeStateSuccess(add: true, delete: false);
+      yield ContactChangeStateSuccess(add: true, delete: false, id: event.id);
     } else if (event is ContactEdited) {
-      yield ContactChangeStateSuccess(add: false, delete: false);
+      yield ContactChangeStateSuccess(add: false, delete: false, id: null);
     } else if (event is DeleteContact) {
       _deleteContact(event.id);
     } else if (event is ContactDeleted) {
-      yield ContactChangeStateSuccess(add: false, delete: true);
+      yield ContactChangeStateSuccess(add: false, delete: true, id: null);
     } else if (event is ContactDeleteFailed) {
-      yield ContactChangeStateFailure(error: Error.contactDelete);
+      yield ContactChangeStateFailure(error: contactDelete);
     }
   }
 
-  void _changeContact(String name, String address, bool add) async {
+  void _changeContact(String name, String address, ContactAction contactAction) async {
     Context context = Context();
     int id = await context.createContact(name, address);
-    if (add) {
-      dispatch(ContactAdded());
+    if (contactAction == ContactAction.add) {
+      dispatch(ContactAdded(id));
     } else {
       Contact contact = contactRepository.get(id);
       contact.prepareReloadValue(Contact.methodContactGetName);
diff --git a/lib/source/contact/contact_change_event.dart b/lib/source/contact/contact_change_event.dart
index 9c25127e..cd3497d5 100644
--- a/lib/source/contact/contact_change_event.dart
+++ b/lib/source/contact/contact_change_event.dart
@@ -40,14 +40,16 @@
  * for more details.
  */
 
+import 'package:ox_talk/source/contact/contact_change.dart';
+
 abstract class ContactChangeEvent {}
 
 class ChangeContact extends ContactChangeEvent {
   final String name;
   final String mail;
-  final bool add;
+  final ContactAction contactAction;
 
-  ChangeContact(this.name, this.mail, this.add);
+  ChangeContact(this.name, this.mail, this.contactAction);
 }
 
 class DeleteContact extends ContactChangeEvent {
@@ -56,7 +58,11 @@ class DeleteContact extends ContactChangeEvent {
   DeleteContact(this.id);
 }
 
-class ContactAdded extends ContactChangeEvent {}
+class ContactAdded extends ContactChangeEvent {
+  final int id;
+
+  ContactAdded(this.id);
+}
 
 class ContactEdited extends ContactChangeEvent {}
 
diff --git a/lib/source/contact/contact_change_state.dart b/lib/source/contact/contact_change_state.dart
index 65b82284..28de2535 100644
--- a/lib/source/contact/contact_change_state.dart
+++ b/lib/source/contact/contact_change_state.dart
@@ -46,6 +46,7 @@ import 'package:ox_talk/source/base/bloc_base_state.dart';
 abstract class ContactChangeState extends BaseState {
   final bool add;
   final bool delete;
+  final int id;
 
   ContactChangeState({
     @required isLoading,
@@ -53,6 +54,7 @@ abstract class ContactChangeState extends BaseState {
     @required error,
     @required this.add,
     @required this.delete,
+    @required this.id
   }) : super(isLoading: isLoading, isSuccess: isSuccess, error: error);
 }
 
@@ -64,6 +66,7 @@ class ContactChangeStateInitial extends ContactChangeState {
           error: '',
           add: null,
           delete: null,
+          id: null,
         );
 }
 
@@ -75,17 +78,19 @@ class ContactChangeStateLoading extends ContactChangeState {
           error: '',
           add: null,
           delete: null,
+          id: null,
         );
 }
 
 class ContactChangeStateSuccess extends ContactChangeState {
-  ContactChangeStateSuccess({@required bool add, @required bool delete})
+  ContactChangeStateSuccess({@required bool add, @required bool delete, @required int id})
       : super(
           isLoading: false,
           isSuccess: true,
           error: '',
           add: add,
           delete: delete,
+          id: id,
         );
 }
 
@@ -97,5 +102,6 @@ class ContactChangeStateFailure extends ContactChangeState {
           error: error,
           add: null,
           delete: null,
+          id: null,
         );
 }
\ No newline at end of file
diff --git a/lib/source/contact/contact_import_bloc.dart b/lib/source/contact/contact_import_bloc.dart
index 361694b1..11066520 100644
--- a/lib/source/contact/contact_import_bloc.dart
+++ b/lib/source/contact/contact_import_bloc.dart
@@ -50,7 +50,7 @@ import 'package:ox_talk/source/contact/contact_import_state.dart';
 import 'package:ox_talk/source/data/repository.dart';
 import 'package:ox_talk/source/data/repository_manager.dart';
 import 'package:shared_preferences/shared_preferences.dart';
-import 'package:simple_permissions/simple_permissions.dart';
+import 'package:permission_handler/permission_handler.dart';
 
 class ContactImportBloc extends Bloc<ContactImportEvent, ContactImportState> {
   static const PREFERENCE_CONTACTS_SYSTEM_IMPORT_SHOWN = "PREFERENCE_CONTACTS_SYSTEM_IMPORT_SHOWN11";
@@ -106,10 +106,10 @@ class ContactImportBloc extends Bloc<ContactImportEvent, ContactImportState> {
   }
 
   Future<bool> hasContactPermission() async {
-    bool readContacts = await SimplePermissions.checkPermission(Permission.ReadContacts);
-    if (!readContacts) {
-      PermissionStatus requestPermission = await SimplePermissions.requestPermission(Permission.ReadContacts);
-      return requestPermission == PermissionStatus.authorized;
+    PermissionStatus readContactsStatus = await PermissionHandler().checkPermissionStatus(PermissionGroup.contacts);
+    if (readContactsStatus != PermissionStatus.granted) {
+      Map<PermissionGroup, PermissionStatus> permissions = await PermissionHandler().requestPermissions([PermissionGroup.contacts]);
+      return permissions[PermissionGroup.contacts] == PermissionStatus.granted;
     } else {
       return true;
     }
diff --git a/lib/source/contact/contact_item.dart b/lib/source/contact/contact_item.dart
index 7a9736ef..e79228bf 100644
--- a/lib/source/contact/contact_item.dart
+++ b/lib/source/contact/contact_item.dart
@@ -40,31 +40,36 @@
  * for more details.
  */
 
+import 'package:delta_chat_core/delta_chat_core.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:ox_talk/source/chat/chat.dart';
 import 'package:ox_talk/source/contact/contact_change.dart';
 import 'package:ox_talk/source/contact/contact_item_bloc.dart';
 import 'package:ox_talk/source/contact/contact_item_event.dart';
 import 'package:ox_talk/source/contact/contact_item_state.dart';
-import 'package:ox_talk/source/ui/dimensions.dart';
+import 'package:ox_talk/source/data/chat_repository.dart';
+import 'package:ox_talk/source/data/repository.dart';
+import 'package:ox_talk/source/widgets/avatar_list_item.dart';
 
 class ContactItem extends StatefulWidget {
   final int _contactId;
+  final bool _createChat;
 
-  ContactItem(this._contactId, key) : super(key: Key(key));
+  ContactItem(this._contactId, this._createChat, key) : super(key: Key(key));
 
   @override
   _ContactItemState createState() => _ContactItemState();
 }
 
 class _ContactItemState extends State<ContactItem> {
-  ContactItemBloc _contactBloc;
+  ContactItemBloc _contactBloc = ContactItemBloc();
+  Repository<Chat> chatRepository = ChatRepository(Chat.getCreator());
 
   @override
   void initState() {
     super.initState();
-    _contactBloc = ContactItemBloc(widget._contactId);
-    _contactBloc.dispatch(RequestContact());
+    _contactBloc.dispatch(RequestContact(widget._contactId));
   }
 
   @override
@@ -73,83 +78,67 @@ class _ContactItemState extends State<ContactItem> {
         bloc: _contactBloc,
         builder: (context, state) {
           if (state is ContactItemStateSuccess) {
-            return buildGestureDetector(state.name, state.email);
+            return AvatarListItem(
+              title: state.name,
+              subTitle: state.email,
+              color: state.color,
+              onTap: onContactTapped,
+            );
           } else if (state is ContactItemStateFailure) {
             return new Text(state.error);
           } else {
-            return new Container();
+            return AvatarListItem(
+              title: "",
+              subTitle: "",
+              onTap: onContactTapped,
+            );
           }
         });
   }
 
-  GestureDetector buildGestureDetector(String name, String email) {
-    return GestureDetector(
-      onTap: () => onContactTapped(name, email),
-      child: Padding(
-        padding: const EdgeInsets.only(top: Dimensions.listItemPaddingSmall),
-        child: Row(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: <Widget>[
-            CircleAvatar(
-              radius: 24.0,
-              child: Text(getInitials(name, email)),
-            ),
-            Expanded(
-              child: Padding(
-                padding: EdgeInsets.symmetric(horizontal: Dimensions.listItemPadding),
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.stretch,
-                  children: <Widget>[
-                    name != null
-                        ? Text(
-                            name,
-                            maxLines: 1,
-                            overflow: TextOverflow.ellipsis,
-                            style: TextStyle(fontWeight: FontWeight.w500, fontSize: 18.0),
-                          )
-                        : Container(),
-                    Padding(
-                      padding: EdgeInsets.symmetric(vertical: Dimensions.listItemPaddingSmall),
-                      child: email != null
-                          ? Text(
-                              email,
-                              maxLines: 1,
-                              overflow: TextOverflow.ellipsis,
-                              style: TextStyle(color: Colors.black45),
-                            )
-                          : Container(),
-                    ),
-                    Divider(),
-                  ],
+  onContactTapped(String name, String email) async {
+    if (!widget._createChat) {
+      Navigator.push(
+        context,
+        MaterialPageRoute(
+            builder: (context) => ContactChange(
+                  contactAction: ContactAction.edit,
+                  id: widget._contactId,
+                  email: email,
+                  name: name,
+                )),
+      );
+    } else {
+      return showDialog<void>(
+          context: context,
+          builder: (BuildContext context) {
+            return AlertDialog(
+              title: Text("Start a chat"),
+              content: new Text("Do you want to start a chat with $name?"),
+              actions: <Widget>[
+                new FlatButton(
+                  child: new Text("Cancel"),
+                  onPressed: () {
+                    Navigator.of(context).pop();
+                  },
                 ),
-              ),
-            )
-          ],
-        ),
-      ),
-    );
-  }
-
-  String getInitials(String name, String email) {
-    if (name != null && name.isNotEmpty) {
-      return name.substring(0, 1);
-    }
-    if (email != null && email.isNotEmpty) {
-      return email.substring(0, 1);
+                new FlatButton(
+                  child: new Text("Yes"),
+                  onPressed: () {
+                    createChat();
+                    Navigator.of(context).pop();
+                  },
+                ),
+              ],
+            );
+          });
     }
-    return "";
   }
 
-  onContactTapped(String name, String email) {
-    Navigator.push(
-      context,
-      MaterialPageRoute(
-          builder: (context) => ContactChange(
-                add: false,
-                id: widget._contactId,
-                email: email,
-                name: name,
-              )),
-    );
+  void createChat() async {
+    Context coreContext = Context();
+    var chatId = await coreContext.createChatByContactId(widget._contactId);
+    chatRepository.putIfAbsent(id: chatId);
+    Navigator.pushReplacement(context, MaterialPageRoute(builder: (context) => ChatScreen(chatId)));
   }
 }
diff --git a/lib/source/contact/contact_item_bloc.dart b/lib/source/contact/contact_item_bloc.dart
index 6a0c34fc..a4c70345 100644
--- a/lib/source/contact/contact_item_bloc.dart
+++ b/lib/source/contact/contact_item_bloc.dart
@@ -41,6 +41,7 @@
  */
 
 import 'dart:async';
+import 'dart:ui';
 
 import 'package:bloc/bloc.dart';
 import 'package:delta_chat_core/delta_chat_core.dart';
@@ -48,12 +49,13 @@ import 'package:ox_talk/source/contact/contact_item_event.dart';
 import 'package:ox_talk/source/contact/contact_item_state.dart';
 import 'package:ox_talk/source/data/repository.dart';
 import 'package:ox_talk/source/data/repository_manager.dart';
+import 'package:ox_talk/source/utils/colors.dart';
 
 class ContactItemBloc extends Bloc<ContactItemEvent, ContactItemState> {
-  final int _contactId;
   final Repository<Contact> contactRepository = RepositoryManager.get(RepositoryType.contact);
+  int _contactId;
 
-  ContactItemBloc(this._contactId);
+  ContactItemBloc();
 
   @override
   ContactItemState get initialState => ContactItemStateInitial();
@@ -61,6 +63,7 @@ class ContactItemBloc extends Bloc<ContactItemEvent, ContactItemState> {
   @override
   Stream<ContactItemState> mapEventToState(ContactItemState currentState, ContactItemEvent event) async* {
     if (event is RequestContact) {
+      this._contactId = event.contactId;
       yield ContactItemStateLoading();
       try {
         _setupContact();
@@ -68,7 +71,7 @@ class ContactItemBloc extends Bloc<ContactItemEvent, ContactItemState> {
         yield ContactItemStateFailure(error: error.toString());
       }
     } else if (event is ContactLoaded) {
-      yield ContactItemStateSuccess(name: event.name, mail: event.mail);
+      yield ContactItemStateSuccess(name: event.name, email: event.email, color: event.color);
     }
   }
 
@@ -76,7 +79,8 @@ class ContactItemBloc extends Bloc<ContactItemEvent, ContactItemState> {
     Contact contact = contactRepository.get(_contactId);
     String name = await contact.getName();
     String mail = await contact.getAddress();
-    dispatch(ContactLoaded(name, mail));
+    int colorValue = await contact.getColor();
+    Color color = rgbColorFromInt(colorValue);
+    dispatch(ContactLoaded(name, mail, color));
   }
-
 }
diff --git a/lib/source/contact/contact_item_event.dart b/lib/source/contact/contact_item_event.dart
index 4a2833ee..cb4d0a90 100644
--- a/lib/source/contact/contact_item_event.dart
+++ b/lib/source/contact/contact_item_event.dart
@@ -39,14 +39,20 @@
  * or FITNESS FOR A PARTICULAR PURPOSE. See the Mozilla Public License 2.0
  * for more details.
  */
+import 'dart:ui';
 
 abstract class ContactItemEvent {}
 
-class RequestContact extends ContactItemEvent {}
+class RequestContact extends ContactItemEvent {
+  final int contactId;
+
+  RequestContact(this.contactId);
+}
 
 class ContactLoaded extends ContactItemEvent {
   final String name;
-  final String mail;
+  final String email;
+  final Color color;
 
-  ContactLoaded(this.name, this.mail);
+  ContactLoaded(this.name, this.email, this.color);
 }
diff --git a/lib/source/contact/contact_item_state.dart b/lib/source/contact/contact_item_state.dart
index c6a574ae..c052f0cc 100644
--- a/lib/source/contact/contact_item_state.dart
+++ b/lib/source/contact/contact_item_state.dart
@@ -39,20 +39,16 @@
  * or FITNESS FOR A PARTICULAR PURPOSE. See the Mozilla Public License 2.0
  * for more details.
  */
+import 'dart:ui';
 
 import 'package:meta/meta.dart';
 import 'package:ox_talk/source/base/bloc_base_state.dart';
 
 abstract class ContactItemState extends BaseState {
-  final String name;
-  final String email;
-
   ContactItemState({
     @required isLoading,
     @required isSuccess,
     @required error,
-    @required this.name,
-    @required this.email,
   }) : super(isLoading: isLoading, isSuccess: isSuccess, error: error);
 }
 
@@ -62,8 +58,6 @@ class ContactItemStateInitial extends ContactItemState {
           isLoading: false,
           isSuccess: false,
           error: '',
-          name: null,
-          email: null,
         );
 }
 
@@ -73,19 +67,19 @@ class ContactItemStateLoading extends ContactItemState {
           isLoading: true,
           isSuccess: false,
           error: '',
-          name: null,
-          email: null,
         );
 }
 
 class ContactItemStateSuccess extends ContactItemState {
-  ContactItemStateSuccess({@required String name, @required String mail})
+  final String name;
+  final String email;
+  final Color color;
+
+  ContactItemStateSuccess({@required this.name, @required this.email, @required this.color})
       : super(
           isLoading: false,
           isSuccess: true,
           error: '',
-          name: name,
-          email: mail,
         );
 }
 
@@ -95,7 +89,5 @@ class ContactItemStateFailure extends ContactItemState {
           isLoading: false,
           isSuccess: false,
           error: error,
-          name: null,
-          email: null,
         );
 }
diff --git a/lib/source/contact/contact_list.dart b/lib/source/contact/contact_list.dart
index 9dcfa6d2..9fd438a1 100644
--- a/lib/source/contact/contact_list.dart
+++ b/lib/source/contact/contact_list.dart
@@ -42,7 +42,6 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:fluttertoast/fluttertoast.dart';
 import 'package:ox_talk/main.dart';
 import 'package:ox_talk/source/base/base_root_child.dart';
 import 'package:ox_talk/source/contact/contact_import_bloc.dart';
@@ -53,9 +52,10 @@ import 'package:ox_talk/source/contact/contact_list_bloc.dart';
 import 'package:ox_talk/source/contact/contact_list_event.dart';
 import 'package:ox_talk/source/contact/contact_list_state.dart';
 import 'package:ox_talk/source/l10n/localizations.dart';
-import 'package:ox_talk/source/ui/default_colors.dart';
-import 'package:ox_talk/source/ui/dialog_util.dart';
-import 'package:ox_talk/source/ui/dimensions.dart';
+import 'package:ox_talk/source/utils/colors.dart';
+import 'package:ox_talk/source/widgets/dialog_builder.dart';
+import 'package:ox_talk/source/utils/dimensions.dart';
+import 'package:ox_talk/source/utils/toast.dart';
 import 'package:rxdart/rxdart.dart';
 
 class ContactListView extends BaseRootChild {
@@ -68,7 +68,7 @@ class ContactListView extends BaseRootChild {
 
   @override
   Color getColor() {
-    return DefaultColors.contactColor;
+    return contactMain;
   }
 
   @override
@@ -81,24 +81,24 @@ class ContactListView extends BaseRootChild {
     );
   }
 
+  _showAddContactView(BuildContext context) {
+    Navigator.pushNamed(context, OxTalkApp.ROUTES_CONTACT_ADD);
+  }
+
   @override
   String getTitle(BuildContext context) {
-    return AppLocalizations.of(context).contactsTitle;
+    return AppLocalizations.of(context).contactTitle;
   }
 
   @override
   String getNavigationText(BuildContext context) {
-    return AppLocalizations.of(context).contactsTitle;
+    return AppLocalizations.of(context).contactTitle;
   }
 
   @override
   IconData getNavigationIcon() {
     return Icons.contacts;
   }
-
-  _showAddContactView(BuildContext context) {
-    Navigator.pushNamed(context, OxTalkApp.ROUTES_CONTACT_ADD);
-  }
 }
 
 class _ContactListState extends State<ContactListView> {
@@ -123,11 +123,11 @@ class _ContactListState extends State<ContactListView> {
 
   handleContactImport(ContactImportState state) {
     if (state is ContactsImportSuccess) {
-      String contactImportSuccess = "${state.changedCount} system contacts imported";
-      _showToast(contactImportSuccess);
+      String contactImportSuccess = AppLocalizations.of(context).contactImportSuccess(state.changedCount);
+      showToast(contactImportSuccess);
     } else if (state is ContactsImportFailure) {
-      String contactImportFailure = "Import failed, missing permissions";
-      _showToast(contactImportFailure);
+      String contactImportFailure = AppLocalizations.of(context).contactImportFailure;
+      showToast(contactImportFailure);
     }
   }
 
@@ -143,9 +143,7 @@ class _ContactListState extends State<ContactListView> {
             child: CircularProgressIndicator(),
           );
         } else {
-          return Center(
-            child: Text("Loading error"),
-          );
+          return Icon(Icons.error);
         }
       },
     );
@@ -159,13 +157,13 @@ class _ContactListState extends State<ContactListView> {
   }
 
   void _showImportDialog(bool initialImport, BuildContext context) {
-    var importTitle = "Import system contacts";
-    var importText = "Would you like to import your system contacts?";
-    var content = initialImport
-        ? "$importText This action can be also done later via the import button in the top action bar."
-        : "$importText Re-importing your contacts will not create duplicates.";
-    var importPositive = "Import";
-    DialogUtil.showConfirmationDialog(
+    var importTitle = AppLocalizations.of(context).contactImportDialogTitle;
+    var importText = AppLocalizations.of(context).contactImportDialogContent;
+    var importTextInitial = AppLocalizations.of(context).contactImportDialogContentExtensionInitial;
+    var importTextRepeat = AppLocalizations.of(context).contactImportDialogContentExtensionRepeat;
+    var content = "$importText ${initialImport ? importTextInitial : importTextRepeat}";
+    var importPositive = AppLocalizations.of(context).import;
+    DialogBuilder.showConfirmationDialog(
       context: context,
       title: importTitle,
       content: content,
@@ -178,20 +176,13 @@ class _ContactListState extends State<ContactListView> {
 
   Widget buildListViewItems(List<int> contactIds, List<int> contactLastUpdateValues) {
     return ListView.builder(
-        padding: EdgeInsets.all(Dimensions.listItemPadding),
+        padding: EdgeInsets.all(listItemPadding),
         itemCount: contactIds.length,
         itemBuilder: (BuildContext context, int index) {
           var contactId = contactIds[index];
           var key = "$contactId-${contactLastUpdateValues[index]}";
-          return ContactItem(contactId, key);
+          return ContactItem(contactId, false, key);
         });
   }
 
-  _showToast(String message) {
-    Fluttertoast.showToast(
-      msg: message,
-      toastLength: Toast.LENGTH_LONG,
-      timeInSecForIos: 4,
-    );
-  }
 }
diff --git a/lib/source/contact/contact_list_bloc.dart b/lib/source/contact/contact_list_bloc.dart
index c7a36bd8..881f5b84 100644
--- a/lib/source/contact/contact_list_bloc.dart
+++ b/lib/source/contact/contact_list_bloc.dart
@@ -74,12 +74,12 @@ class ContactListBloc extends Bloc<ContactListEvent, ContactListState> {
   @override
   void dispose() {
     super.dispose();
-    contactRepository.removeListener(hashCode, Dc.eventContactsChanged);
+    contactRepository.removeListener(hashCode, Event.contactsChanged);
     streamSubscription.cancel();
   }
 
   void setupContactListener() async {
-    contactRepository.addListener(hashCode, Dc.eventContactsChanged);
+    contactRepository.addListener(hashCode, Event.contactsChanged);
     streamSubscription = contactRepository.observable.listen((event) => dispatch(ContactsChanged()));
   }
 
diff --git a/lib/source/contact/selectable_contact_item.dart b/lib/source/contact/selectable_contact_item.dart
new file mode 100644
index 00000000..de5ff362
--- /dev/null
+++ b/lib/source/contact/selectable_contact_item.dart
@@ -0,0 +1,106 @@
+/*
+ * OPEN-XCHANGE legal information
+ *
+ * All intellectual property rights in the Software are protected by
+ * international copyright laws.
+ *
+ *
+ * In some countries OX, OX Open-Xchange and open xchange
+ * as well as the corresponding Logos OX Open-Xchange and OX are registered
+ * trademarks of the OX Software GmbH group of companies.
+ * The use of the Logos is not covered by the Mozilla Public License 2.0 (MPL 2.0).
+ * Instead, you are allowed to use these Logos according to the terms and
+ * conditions of the Creative Commons License, Version 2.5, Attribution,
+ * Non-commercial, ShareAlike, and the interpretation of the term
+ * Non-commercial applicable to the aforementioned license is published
+ * on the web site https://www.open-xchange.com/terms-and-conditions/.
+ *
+ * Please make sure that third-party modules and libraries are used
+ * according to their respective licenses.
+ *
+ * Any modifications to this package must retain all copyright notices
+ * of the original copyright holder(s) for the original code used.
+ *
+ * After any such modifications, the original and derivative code shall remain
+ * under the copyright of the copyright holder(s) and/or original author(s) as stated here:
+ * https://www.open-xchange.com/legal/. The contributing author shall be
+ * given Attribution for the derivative code and a license granting use.
+ *
+ * Copyright (C) 2016-2020 OX Software GmbH
+ * Mail: info@open-xchange.com
+ *
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the Mozilla Public License 2.0
+ * for more details.
+ */
+
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:ox_talk/source/contact/contact_item_bloc.dart';
+import 'package:ox_talk/source/contact/contact_item_event.dart';
+import 'package:ox_talk/source/contact/contact_item_state.dart';
+import 'package:ox_talk/source/widgets/avatar_list_item.dart';
+
+class SelectableContactItem extends StatefulWidget {
+  final int _contactId;
+  final Function onTap;
+
+  SelectableContactItem(this._contactId, this.onTap, key) : super(key: Key(key));
+
+  @override
+  _SelectableContactItemState createState() => _SelectableContactItemState();
+}
+
+class _SelectableContactItemState extends State<SelectableContactItem> {
+  ContactItemBloc _contactBloc = ContactItemBloc();
+  var isSelected = false;
+
+  @override
+  void initState() {
+    super.initState();
+    _contactBloc.dispatch(RequestContact(widget._contactId));
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocBuilder(
+      bloc: _contactBloc,
+      builder: (context, state) {
+        if (state is ContactItemStateSuccess) {
+          return AvatarListItem(
+            title: state.name,
+            subTitle: state.email,
+            color: state.color,
+            avatarIcon: isSelected ? Icons.check : null,
+            onTap: onContactTapped,
+          );
+        } else if (state is ContactItemStateFailure) {
+          return new Text(state.error);
+        } else {
+          return AvatarListItem(
+            title: "",
+            subTitle: "",
+            onTap: onContactTapped,
+          );
+        }
+      });
+  }
+
+  onContactTapped(String name, String email) {
+    setState(() {
+      if(isSelected){
+        isSelected = false;
+      }
+      else{
+        isSelected = true;
+      }
+    });
+    widget.onTap(widget._contactId);
+  }
+}
diff --git a/lib/source/data/chat_list_repository.dart b/lib/source/data/chat_list_repository.dart
index 7b38139e..102d53fc 100644
--- a/lib/source/data/chat_list_repository.dart
+++ b/lib/source/data/chat_list_repository.dart
@@ -48,15 +48,28 @@ class ChatListRepository extends Repository<ChatList> {
   ChatListRepository(RepositoryItemCreator<ChatList> creator) : super(creator);
 
   @override
-  success(Event event) {
-    // TODO: implement success
-    return null;
+  success(Event event) async{
+    if (event.eventId == Event.chatModified) {
+      await setupChatListAfterUpdate();
+    }
+    super.success(event);
+  }
+  Future<void> setupChatListAfterUpdate() async {
+    ChatList chatList = ChatList();
+    int chatCount = await chatList.getChatCnt();
+    List<int> chatIds = List();
+    if (chatCount > 0) {
+      for (int i = 0; i < chatCount; i++) {
+        int chatId = await chatList.getChat(i);
+        chatIds.add(chatId);
+      }
+    }
+    update(ids: chatIds);
   }
 
   @override
   error(error) {
-    // TODO: implement error
-    return null;
+    super.error(error);
   }
 
 
diff --git a/lib/source/data/chat_message_repository.dart b/lib/source/data/chat_message_repository.dart
index d98cecfe..ff35f48e 100644
--- a/lib/source/data/chat_message_repository.dart
+++ b/lib/source/data/chat_message_repository.dart
@@ -49,15 +49,12 @@ class ChatMessageRepository extends Repository<ChatMsg> {
 
   @override
   success(Event event) {
-    // TODO: implement success
-    return null;
+    super.success(event);
   }
 
   @override
   error(error) {
-    // TODO: implement error
-    return null;
+    super.error(error);
   }
 
-
 }
\ No newline at end of file
diff --git a/lib/source/data/chat_repository.dart b/lib/source/data/chat_repository.dart
index 46ad7127..19c67d73 100644
--- a/lib/source/data/chat_repository.dart
+++ b/lib/source/data/chat_repository.dart
@@ -49,15 +49,12 @@ class ChatRepository extends Repository<Chat> {
 
   @override
   success(Event event) {
-    // TODO: implement success
-    return null;
+    super.success(event);
   }
 
   @override
   error(error) {
-    // TODO: implement error
-    return null;
+    super.error(error);
   }
 
-
 }
\ No newline at end of file
diff --git a/lib/source/data/config.dart b/lib/source/data/config.dart
new file mode 100644
index 00000000..fa93ac05
--- /dev/null
+++ b/lib/source/data/config.dart
@@ -0,0 +1,137 @@
+/*
+ * OPEN-XCHANGE legal information
+ *
+ * All intellectual property rights in the Software are protected by
+ * international copyright laws.
+ *
+ *
+ * In some countries OX, OX Open-Xchange and open xchange
+ * as well as the corresponding Logos OX Open-Xchange and OX are registered
+ * trademarks of the OX Software GmbH group of companies.
+ * The use of the Logos is not covered by the Mozilla Public License 2.0 (MPL 2.0).
+ * Instead, you are allowed to use these Logos according to the terms and
+ * conditions of the Creative Commons License, Version 2.5, Attribution,
+ * Non-commercial, ShareAlike, and the interpretation of the term
+ * Non-commercial applicable to the aforementioned license is published
+ * on the web site https://www.open-xchange.com/terms-and-conditions/.
+ *
+ * Please make sure that third-party modules and libraries are used
+ * according to their respective licenses.
+ *
+ * Any modifications to this package must retain all copyright notices
+ * of the original copyright holder(s) for the original code used.
+ *
+ * After any such modifications, the original and derivative code shall remain
+ * under the copyright of the copyright holder(s) and/or original author(s) as stated here:
+ * https://www.open-xchange.com/legal/. The contributing author shall be
+ * given Attribution for the derivative code and a license granting use.
+ *
+ * Copyright (C) 2016-2020 OX Software GmbH
+ * Mail: info@open-xchange.com
+ *
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the Mozilla Public License 2.0
+ * for more details.
+ */
+
+import 'package:delta_chat_core/delta_chat_core.dart';
+
+class Config {
+  static Config _instance;
+
+  Context _context = Context();
+  int _lastUpdate = -1;
+
+  String username;
+  String status;
+  String avatarPath;
+  String email;
+  String imapLogin;
+  String imapServer;
+  int imapPort;
+  String smtpLogin;
+  String smtpServer;
+  int smtpPort;
+
+  Config._internal();
+
+  factory Config() {
+    if (_instance == null) {
+      _instance = new Config._internal();
+    }
+    return _instance;
+  }
+
+  load() async {
+    if (_lastUpdate != -1) {
+      return;
+    }
+    username = await _context.getConfigValue(Context.configDisplayName);
+    avatarPath = await _context.getConfigValue(Context.configSelfAvatar);
+    status = await _context.getConfigValue(Context.configSelfStatus);
+    email = await _context.getConfigValue(Context.configAddress);
+    imapLogin = await _context.getConfigValue(Context.configMailUser);
+    imapServer = await _context.getConfigValue(Context.configMailServer);
+    imapPort = await _context.getConfigValue(Context.configMailPort, ObjectType.int);
+    smtpLogin = await _context.getConfigValue(Context.configSendUser);
+    smtpServer = await _context.getConfigValue(Context.configSendServer);
+    smtpPort = await _context.getConfigValue(Context.configSendPort, ObjectType.int);
+  }
+
+  reload() async {
+    _lastUpdate = -1;
+    await load();
+  }
+
+  void setValue(String key, var value, [allowNullEmptyAndValues]) {
+    if (allowNullEmptyAndValues == null || !allowNullEmptyAndValues) {
+      if ((value == null || (value is String && value.isEmpty))) {
+        return;
+      }
+    }
+
+    switch (key) {
+      case Context.configDisplayName:
+        username = value;
+        break;
+      case Context.configSelfAvatar:
+        avatarPath = value;
+        break;
+      case Context.configSelfStatus:
+        status = value;
+        break;
+      case Context.configAddress:
+        email = value;
+        break;
+      case Context.configMailUser:
+        imapLogin = value;
+        break;
+      case Context.configMailServer:
+        imapServer = value;
+        break;
+      case Context.configMailPort:
+        imapPort = value;
+        break;
+      case Context.configSendUser:
+        smtpLogin = value;
+        break;
+      case Context.configSendServer:
+        smtpServer = value;
+        break;
+      case Context.configSendPort:
+        smtpPort = value;
+        break;
+    }
+    _context.setConfigValue(key, value);
+  }
+
+  String get smtpPortAsString => imapPort > 0 ? imapPort : "";
+
+  String get imapPortAsString => imapPort > 0 ? imapPort : "";
+}
diff --git a/lib/source/data/contact_repository.dart b/lib/source/data/contact_repository.dart
index 77b656e6..3f47ebd7 100644
--- a/lib/source/data/contact_repository.dart
+++ b/lib/source/data/contact_repository.dart
@@ -40,16 +40,17 @@
  * for more details.
  */
 
+import 'dart:async';
+
 import 'package:delta_chat_core/delta_chat_core.dart';
 import 'package:ox_talk/source/data/repository.dart';
 
 class ContactRepository extends Repository<Contact> {
-
   ContactRepository(RepositoryItemCreator<Contact> creator) : super(creator);
 
   @override
   success(Event event) async {
-    if (event.eventId == Dc.eventContactsChanged) {
+    if (event.eventId == Event.contactsChanged) {
       await setupContactsAfterUpdate();
     }
     super.success(event);
@@ -65,5 +66,4 @@ class ContactRepository extends Repository<Contact> {
   error(error) {
     super.error(error);
   }
-
-}
\ No newline at end of file
+}
diff --git a/lib/source/data/repository.dart b/lib/source/data/repository.dart
index 45b4bbfe..1d678bce 100644
--- a/lib/source/data/repository.dart
+++ b/lib/source/data/repository.dart
@@ -60,7 +60,12 @@ abstract class Repository<T extends Base> {
   Observable get observable => Observable(_behaviorSubject.stream);
 
   T get(int id) {
-    return _items[id];
+    var item = _items[id];
+    if (item == null) {
+      _putIfAbsent(id);
+      item = _items[id];
+    }
+    return item;
   }
 
   List<T> getAll() {
diff --git a/lib/source/data/repository_manager.dart b/lib/source/data/repository_manager.dart
index 36b23534..45f1d589 100644
--- a/lib/source/data/repository_manager.dart
+++ b/lib/source/data/repository_manager.dart
@@ -46,15 +46,12 @@ import 'package:ox_talk/source/data/chat_message_repository.dart';
 import 'package:ox_talk/source/data/chat_repository.dart';
 import 'package:ox_talk/source/data/contact_repository.dart';
 import 'package:ox_talk/source/data/repository.dart';
-import 'package:ox_talk/source/data/user_repository.dart';
-import 'package:ox_talk/source/profile/user.dart';
 
 enum RepositoryType {
   chatList,
   chat,
   chatMessage,
   contact,
-  user
 }
 
 class RepositoryManager {
@@ -70,7 +67,7 @@ class RepositoryManager {
       Repository repository;
       switch (type) {
         case RepositoryType.chatList:
-          repository = ChatListRepository(ChatList.getCreator());
+          repository = ChatListRepository((id) => ChatList());
           break;
         case RepositoryType.chat:
           repository = ChatRepository(Chat.getCreator());
@@ -81,9 +78,6 @@ class RepositoryManager {
         case RepositoryType.contact:
           repository = ContactRepository(Contact.getCreator());
           break;
-        case RepositoryType.user:
-          repository = UserRepository(User.getCreator());
-          break;
       }
       if (repository != null) {
         _repositories[identifier] = repository;
diff --git a/lib/source/l10n/localizations.dart b/lib/source/l10n/localizations.dart
index 2cab70bb..2e646886 100644
--- a/lib/source/l10n/localizations.dart
+++ b/lib/source/l10n/localizations.dart
@@ -68,45 +68,101 @@ class AppLocalizations {
   //call flutter pub pub run intl_translation:generate_from_arb --output-dir=lib/source/l10n \ --no-use-deferred-loading lib/source/l10n/localizations.dart lib/source/l10n/intl_*.arb
   //translation complete
 
-  String get mailTitle {
-    return Intl.message('Mail', name: 'mailTitle');
-  }
-
-  String get chatTitle {
-    return Intl.message('Chat', name: 'chatTitle');
-  }
-
-  String get contactsTitle {
-    return Intl.message('Contacts', name: 'contactsTitle');
-  }
-
-  String get profileTitle {
-    return Intl.message('Profile', name: 'profileTitle');
-  }
-
-  String get profileStatusPlaceholder{
-    return Intl.message('No status', name: 'profileStatusPlaceholder');
-  }
-
-  String get editUserSettingsTitle {
-    return Intl.message('Edit user settings', name: 'editUserSettingsTitle');
-  }
-
-  String get editUserSettingsUsernameLabel {
-    return Intl.message('Username', name: 'editUserSettingsUsernameLabel');
-  }
-
-  String get editUserSettingsStatusLabel {
-    return Intl.message('Status', name: 'editUserSettingsStatusLabel');
-  }
-
-  String get editUserSettingsSaveButton {
-    return Intl.message('Save', name: 'editUserSettingsSaveButton');
-  }
-
-  String get editAccountSettingsTitle {
-    return Intl.message('Edit account settings', name: 'editAccountSettingsTitle');
-  }
+  // No translation
+  String get sslTls => "SSL/TLS";
+  String get startTLS => "StartTLS";
+
+  // No translation + DCC default values which should get adjusted
+  String get deltaChatStatusDefaultValue => "Sent with my Delta Chat Messenger: https://delta.chat";
+
+  // Global
+  String get yes => Intl.message('Yes', name: 'yes');
+  String get no => Intl.message('No', name: 'no');
+  String get delete => Intl.message('Delete', name: 'delete');
+  String get import => Intl.message('Import', name: 'import');
+  String get advanced => Intl.message('Advanced', name: 'advanced');
+  String get inbox => Intl.message('Inbox', name: 'inbox');
+  String get outbox => Intl.message('Outbox', name: 'outbox');
+  String get emailAddress => Intl.message('Email address', name: 'emailAddress');
+  String get password => Intl.message('Password', name: 'password');
+  String get automatic => Intl.message('Automatic', name: 'automatic');
+  String get off => Intl.message('Off', name: 'off');
+  String get name => Intl.message('Name', name: 'name');
+
+  // Form
+  String get validatableTextFormFieldHintInvalidEmail => Intl.message('Please enter a valid e-mail address', name: 'validatableTextFormFieldHintInvalidEmail');
+  String get validatableTextFormFieldHintInvalidPort => Intl.message('Please enter a valid port (1-65535)', name: 'validatableTextFormFieldHintInvalidPort');
+  String get validatableTextFormFieldHintInvalidPassword => Intl.message('Please enter your password', name: 'validatableTextFormFieldHintInvalidPassword');
+  String get validatableTextFormFieldHintEmptyString => Intl.message('This field can not be empty', name: 'validatableTextFormFieldHintEmptyString');
+
+  // Login
+  String get loginTitle => Intl.message('Login to OX Talk', name: 'loginTitle');
+  String get loginInformation => Intl.message('For known email providers additional settings are setup automatically. Sometimes IMAP needs to be enabled in the web frontend. Consult your email provider or friends for help.', name: 'loginInformation');
+  String get loginHintEmail => Intl.message('Enter your email address', name: 'loginLabelEmail');
+  String get loginHintPassword => Intl.message('Enter your password', name: 'loginHintPassword');
+  String get loginLabelImapName => Intl.message('IMAP login-name', name: 'loginLabelImapName');
+  String get loginLabelImapPassword => Intl.message('IMAP password', name: 'loginLabelImapPassword');
+  String get loginLabelImapServer => Intl.message('IMAP server', name: 'loginLabelImapServer');
+  String get loginLabelImapPort => Intl.message('IMAP port', name: 'loginLabelImapPort');
+  String get loginLabelImapSecurity => Intl.message('IMAP Security', name: 'loginLabelImapSecurity');
+  String get loginLabelSmtpName => Intl.message('SMTP login-name', name: 'loginLabelSmtpName');
+  String get loginLabelSmtpPassword => Intl.message('SMTP password', name: 'loginLabelSmtpPassword');
+  String get loginLabelSmtpServer => Intl.message('SMTP server', name: 'loginLabelSmtpServer');
+  String get loginLabelSmtpPort => Intl.message('SMTP port', name: 'loginLabelSmtpPort');
+  String get loginLabelSmtpSecurity => Intl.message('SMTP Security', name: 'loginLabelSmtpSecurity');
+  String get loginProgressMessage => Intl.message('Logging in, this may take a moment', name: 'loginProgressMessage');
+
+  // Mail
+  String get mailTitle => Intl.message('Mail', name: 'mailTitle');
+
+  // Chat
+  String get chatTitle => Intl.message('Chat', name: 'chatTitle');
+
+  //Create chat
+  String get createChatTitle => Intl.message('Create chat', name: 'createChatTitle');
+  String get createChatNewContactButtonText => Intl.message('New contact', name: 'createChatNewContactButtonText');
+  String get createChatCreateGroupButtonText => Intl.message('Create group', name: 'createChatCreateGroupButtonText');
+
+  //Group
+  String get createGroupTitle => Intl.message('Create group chat', name: 'createGroupTitle');
+  String get createGroupTextFieldLabel => Intl.message('Group name', name: 'createGroupTextFieldLabel');
+  String get createGroupTextFieldHint => Intl.message('Set a group name', name: 'createGroupTextFieldHint');
+  String get createGroupSelectContactsInfo => Intl.message('Select all contacts for this group', name: 'createGroupSelectContactsInfo');
+
+  // Contact
+  String get contactTitle => Intl.message('Contacts', name: 'contactTitle');
+  String get contactChangeAddTitle => Intl.message('Add Contact', name: 'contactChangeAddTitle');
+  String get contactChangeAddToast => Intl.message('Contact successfully added', name: 'contactChangeAddToast');
+  String get contactChangeEditTitle => Intl.message('Edit Name', name: 'contactChangeEditTitle');
+  String get contactChangeEditToast => Intl.message('Contact successfully edited', name: 'contactChangeEditToast');
+  String get contactChangeDeleteTitle => Intl.message('Delete Contact', name: 'contactChangeDeleteTitle');
+  String get contactChangeDeleteToast => Intl.message('Contact successfully deleted', name: 'contactChangeDeleteToast');
+  String get contactChangeDeleteFailedToast => Intl.message('Could not delete contact.', name: 'contactChangeDeleteFailedToast');
+  String contactChangeDeleteDialogContent(email, name) => Intl.message('"Do you really want to delete $email ($name)?', name: 'contactChangeDeleteDialogContent', args: [email, name]);
+  String get contactChangeNameHint => Intl.message('"Enter the contact name"', name: 'contactChangeNameHint');
+
+  String get contactImportDialogTitle => Intl.message('Import system contacts', name: 'contactImportDialogTitle');
+  String get contactImportDialogContent => Intl.message('Would you like to import your system contacts?', name: 'contactImportDialogContent');
+  String get contactImportDialogContentExtensionInitial => Intl.message('This action can be also done later via the import button in the top action bar.', name: 'contactImportDialogContent');
+  String get contactImportDialogContentExtensionRepeat => Intl.message('Re-importing your contacts will not create duplicates.', name: 'contactImportDialogContent');
+  String contactImportSuccess(count) => Intl.message('$count system contacts imported', name: 'contactImportSuccess', args: [count]);
+  String get contactImportFailure => Intl.message('Import failed, missing permissions', name: 'contactImportFailure');
+
+  // Profile
+  String get profileTitle => Intl.message('Profile', name: 'profileTitle');
+  String get profileUsernamePlaceholder => Intl.message('No username set', name: 'profileUsernamePlaceholder');
+  String get profileStatusPlaceholder => Intl.message('No status set', name: 'profileStatusPlaceholder');
+  String get profileEditButton => Intl.message('Edit profile', name: 'profileEditButton');
+
+  // User settings
+  String get editUserSettingsTitle => Intl.message('Edit user settings', name: 'editUserSettingsTitle');
+  String get editUserSettingsUsernameLabel => Intl.message('Username', name: 'editUserSettingsUsernameLabel');
+  String get editUserSettingsStatusLabel => Intl.message('Status', name: 'editUserSettingsStatusLabel');
+  String get editUserSettingsSaveButton => Intl.message('Save', name: 'editUserSettingsSaveButton');
+  String get editUserSettingsStatusDefaultValue => Intl.message('Sent with OX Talk - https://github.com/open-xchange/ox-talk', name: 'editUserSettingsStatusDefaultValue');
+
+  // Account settings
+  String get editAccountSettingsTitle => Intl.message('Edit account settings', name: 'editAccountSettingsTitle');
 }
 
 class AppLocalizationsDelegate extends LocalizationsDelegate<AppLocalizations> {
diff --git a/lib/source/base/bloc_delegate.dart b/lib/source/log/bloc_delegate.dart
similarity index 100%
rename from lib/source/base/bloc_delegate.dart
rename to lib/source/log/bloc_delegate.dart
diff --git a/lib/source/login/login.dart b/lib/source/login/login.dart
index 6d16a977..5db54020 100644
--- a/lib/source/login/login.dart
+++ b/lib/source/login/login.dart
@@ -41,11 +41,12 @@
  */
 
 import 'package:flutter/material.dart';
-import 'package:ox_talk/source/form/validatable_text_form_field.dart';
+import 'package:ox_talk/source/widgets/validatable_text_form_field.dart';
+import 'package:ox_talk/source/l10n/localizations.dart';
 import 'package:ox_talk/source/login/login_bloc.dart';
 import 'package:ox_talk/source/login/login_events.dart';
 import 'package:ox_talk/source/login/login_state.dart';
-import 'package:ox_talk/source/ui/progress_handler.dart';
+import 'package:ox_talk/source/widgets/progress_handler.dart';
 import 'package:rxdart/rxdart.dart';
 
 class Login extends StatefulWidget {
@@ -61,18 +62,33 @@ class _LoginState extends State<Login> {
   final LoginBloc _loginBloc = LoginBloc();
   final _simpleLoginKey = GlobalKey<FormState>();
   final _advancedLoginKey = GlobalKey<FormState>();
-  final emailField =
-      ValidatableTextFormField("Email address", "Enter your email address", textFormType: TextFormType.email, inputType: TextInputType.emailAddress);
-  final passwordField = ValidatableTextFormField("Password", "Enter your password", textFormType: TextFormType.password);
-  final imapLoginNameField = ValidatableTextFormField("IMAP login-name", "");
-  final imapServerField = ValidatableTextFormField("IMAP server", "");
-  final imapPortField = ValidatableTextFormField("IMAP port", "", textFormType: TextFormType.port, inputType: TextInputType.numberWithOptions());
-  final smtpLoginNameField = ValidatableTextFormField("SMTP login-name", "");
-  final smtpPasswordField = ValidatableTextFormField("SMTP password", "", textFormType: TextFormType.password, needValidation: false);
-  final smtpServerField = ValidatableTextFormField("SMTP server", "");
-  final smtpPortField = ValidatableTextFormField("SMTP port", "", textFormType: TextFormType.port, inputType: TextInputType.numberWithOptions());
-
-  List<String> _securityOptions = List();
+  ValidatableTextFormField emailField = ValidatableTextFormField(
+        (context) => AppLocalizations.of(context).emailAddress,
+    hintText: (context) => AppLocalizations.of(context).loginHintEmail,
+    textFormType: TextFormType.email,
+    inputType: TextInputType.emailAddress,
+  );
+  ValidatableTextFormField passwordField = ValidatableTextFormField(
+  (context) => AppLocalizations.of(context).password,
+  hintText: (context) => AppLocalizations.of(context).loginHintPassword,
+  textFormType: TextFormType.password,
+  );
+  ValidatableTextFormField imapLoginNameField = ValidatableTextFormField((context) => AppLocalizations.of(context).loginLabelImapName);
+  ValidatableTextFormField imapServerField = ValidatableTextFormField((context) => AppLocalizations.of(context).loginLabelImapServer);
+  ValidatableTextFormField imapPortField = ValidatableTextFormField((context) => AppLocalizations.of(context).loginLabelImapPort);
+  ValidatableTextFormField smtpLoginNameField = ValidatableTextFormField((context) => AppLocalizations.of(context).loginLabelSmtpName);
+  ValidatableTextFormField smtpPasswordField = ValidatableTextFormField(
+  (context) => AppLocalizations.of(context).loginLabelSmtpPassword,
+  textFormType: TextFormType.password,
+  needValidation: false,
+  );
+  ValidatableTextFormField smtpServerField = ValidatableTextFormField((context) => AppLocalizations.of(context).loginLabelSmtpServer);
+  ValidatableTextFormField smtpPortField = ValidatableTextFormField(
+  (context) => AppLocalizations.of(context).loginLabelSmtpPort,
+  textFormType: TextFormType.port,
+  inputType: TextInputType.numberWithOptions(),
+  );
+
   String _selectedImapSecurity;
   String _selectedSmtpSecurity;
   bool _showAdvanced = false;
@@ -82,9 +98,6 @@ class _LoginState extends State<Login> {
   @override
   void initState() {
     super.initState();
-    _securityOptions.addAll(["Automatic", "SSL/TLS", "StartTLS", "Off"]);
-    _selectedImapSecurity = _securityOptions.elementAt(0);
-    _selectedSmtpSecurity = _securityOptions.elementAt(0);
     final loginObservable = new Observable<LoginState>(_loginBloc.state);
     loginObservable.listen((event) => handleLoginStateChange(event));
   }
@@ -144,7 +157,7 @@ class _LoginState extends State<Login> {
   Widget build(BuildContext context) {
     return Scaffold(
         appBar: AppBar(
-          title: Text("Login to COI"),
+          title: Text(AppLocalizations.of(context).loginTitle),
           actions: <Widget>[IconButton(icon: Icon(Icons.check), onPressed: _loginPressed)],
         ),
         body: createBuilder());
@@ -155,13 +168,15 @@ class _LoginState extends State<Login> {
       child: Column(
         children: <Widget>[
           Container(
-              padding: const EdgeInsets.all(12.0),
-              color: Colors.blueGrey,
-              child: Text(
-                  "For known email providers additional settings are setup automatically. Sometimes IMAP needs to be enabled in the web frontend. Consult your email provider or friends for help.",
-                  softWrap: true,
-                  textAlign: TextAlign.center,
-                  style: TextStyle(color: Colors.white))),
+            padding: const EdgeInsets.all(12.0),
+            color: Colors.blueGrey,
+            child: Text(
+              AppLocalizations.of(context).loginInformation,
+              softWrap: true,
+              textAlign: TextAlign.center,
+              style: TextStyle(color: Colors.white),
+            ),
+          ),
           Container(
               padding: const EdgeInsets.only(
                 left: 20.0,
@@ -181,7 +196,7 @@ class _LoginState extends State<Login> {
               mainAxisAlignment: MainAxisAlignment.center,
               children: <Widget>[
                 Text(
-                  "Advanced",
+                  AppLocalizations.of(context).advanced,
                   style: TextStyle(fontSize: 16.0),
                 ),
                 _showAdvanced ? Icon(Icons.arrow_drop_up) : Icon(Icons.arrow_drop_down)
@@ -202,35 +217,31 @@ class _LoginState extends State<Login> {
           child: Column(
             crossAxisAlignment: CrossAxisAlignment.stretch,
             children: <Widget>[
-              Text("Inbox"),
+              Text(AppLocalizations.of(context).inbox),
               imapLoginNameField,
               imapServerField,
               imapPortField,
               Padding(padding: EdgeInsets.only(top: 12.0)),
-              Text("IMAP Security"),
+              Text(AppLocalizations.of(context).loginLabelImapSecurity),
               DropdownButton(
                   value: _selectedImapSecurity,
-                  items: _securityOptions.map<DropdownMenuItem<String>>((String value) {
-                    return DropdownMenuItem<String>(value: value, child: Text(value));
-                  }).toList(),
+                  items: getSecurityOptions(),
                   onChanged: (String newValue) {
                     setState(() {
                       _selectedImapSecurity = newValue;
                     });
                   }),
               Padding(padding: EdgeInsets.only(top: 12.0)),
-              Text("Outbox"),
+              Text(AppLocalizations.of(context).outbox),
               smtpLoginNameField,
               smtpPasswordField,
               smtpServerField,
               smtpPortField,
               Padding(padding: EdgeInsets.only(top: 12.0)),
-              Text("SMTP Security"),
+              Text(AppLocalizations.of(context).loginLabelSmtpSecurity),
               DropdownButton(
                   value: _selectedSmtpSecurity,
-                  items: _securityOptions.map<DropdownMenuItem<String>>((String value) {
-                    return DropdownMenuItem<String>(value: value, child: Text(value));
-                  }).toList(),
+                  items: getSecurityOptions(),
                   onChanged: (String newValue) {
                     setState(() {
                       _selectedSmtpSecurity = newValue;
@@ -240,4 +251,16 @@ class _LoginState extends State<Login> {
           ),
         ));
   }
+
+  List<DropdownMenuItem<String>> getSecurityOptions() {
+    return [
+      AppLocalizations.of(context).automatic,
+      AppLocalizations.of(context).sslTls,
+      AppLocalizations.of(context).startTLS,
+      AppLocalizations.of(context).off,
+    ].map<DropdownMenuItem<String>>((String value) {
+      return DropdownMenuItem<String>(value: value, child: Text(value));
+    }).toList();
+  }
+
 }
diff --git a/lib/source/login/login_bloc.dart b/lib/source/login/login_bloc.dart
index 0c4e4875..8bdaa7d4 100644
--- a/lib/source/login/login_bloc.dart
+++ b/lib/source/login/login_bloc.dart
@@ -42,6 +42,7 @@
 
 import 'package:bloc/bloc.dart';
 import 'package:delta_chat_core/delta_chat_core.dart';
+import 'package:ox_talk/source/data/config.dart';
 import 'package:ox_talk/source/login/login_events.dart';
 import 'package:ox_talk/source/login/login_state.dart';
 
@@ -77,30 +78,24 @@ class LoginBloc extends Bloc<LoginEvent, LoginState> {
   @override
   void dispose() {
     super.dispose();
-    _core.removeListener(Dc.eventConfigureProgress, _listenerId);
+    _core.removeListener(Event.configureProgress, _listenerId);
   }
 
   void _setupConfig(LoginButtonPressed event) {
-    setConfigValueIfPresent(Context.configAddress, event.email);
-    setConfigValueIfPresent(Context.configMailPassword, event.password);
-    setConfigValueIfPresent(Context.configMailUser, event.imapLogin);
-    setConfigValueIfPresent(Context.configMailServer, event.imapServer);
-    setConfigValueIfPresent(Context.configMailPassword, event.imapPort);
-    setConfigValueIfPresent(Context.configSendUser, event.smtpLogin);
-    setConfigValueIfPresent(Context.configSendPassword, event.smtpPassword);
-    setConfigValueIfPresent(Context.configSendServer, event.smtpServer);
-    setConfigValueIfPresent(Context.configSendPort, event.smtpPort);
-  }
-
-  void setConfigValueIfPresent(String key, var value) async {
-    if (value == null || (value is String && value.isEmpty)) {
-      return;
-    }
-    await _context.setConfigValue(key, value);
+    Config config = Config();
+    config.setValue(Context.configAddress, event.email);
+    config.setValue(Context.configMailPassword, event.password);
+    config.setValue(Context.configMailUser, event.imapLogin);
+    config.setValue(Context.configMailServer, event.imapServer);
+    config.setValue(Context.configMailPassword, event.imapPort);
+    config.setValue(Context.configSendUser, event.smtpLogin);
+    config.setValue(Context.configSendPassword, event.smtpPassword);
+    config.setValue(Context.configSendServer, event.smtpServer);
+    config.setValue(Context.configSendPort, event.smtpPort);
   }
 
   void registerListener() async {
-    _listenerId = await _core.listen(Dc.eventConfigureProgress, _successCallback, _errorCallback);
+    _listenerId = await _core.listen(Event.configureProgress, _successCallback, _errorCallback);
   }
 
   bool _loginSuccess(int progress) {
diff --git a/lib/source/maillist/mail_list.dart b/lib/source/maillist/mail_list.dart
index fca46026..10d26dea 100644
--- a/lib/source/maillist/mail_list.dart
+++ b/lib/source/maillist/mail_list.dart
@@ -44,8 +44,8 @@ import 'package:flutter/material.dart';
 import 'package:ox_talk/source/base/base_root_child.dart';
 import 'package:ox_talk/source/l10n/localizations.dart';
 import 'package:ox_talk/source/maillist/mail_list_item.dart';
-import 'package:ox_talk/source/ui/default_colors.dart';
-import 'package:ox_talk/source/ui/dimensions.dart';
+import 'package:ox_talk/source/utils/colors.dart';
+import 'package:ox_talk/source/utils/dimensions.dart';
 
 class MailListView extends BaseRootChild {
 
@@ -53,7 +53,7 @@ class MailListView extends BaseRootChild {
 
   @override
   Color getColor() {
-    return DefaultColors.mailColor;
+    return mailMain;
   }
 
   @override
@@ -85,7 +85,7 @@ class _MailListState extends State<MailListView> {
   @override
   Widget build(BuildContext context) {
     return ListView.builder(
-      padding: EdgeInsets.all(Dimensions.listItemPadding),
+      padding: EdgeInsets.all(listItemPadding),
       itemBuilder: (BuildContext context, int index) {
         Mail contact = Mail("name $index", "subject $index", "message $index", false, false, false, false);
         return MailListItem(contact);
diff --git a/lib/source/maillist/mail_list_item.dart b/lib/source/maillist/mail_list_item.dart
index 2a932e28..0506beaa 100644
--- a/lib/source/maillist/mail_list_item.dart
+++ b/lib/source/maillist/mail_list_item.dart
@@ -41,7 +41,7 @@
  */
 
 import 'package:flutter/material.dart';
-import 'package:ox_talk/source/ui/dimensions.dart';
+import 'package:ox_talk/source/utils/dimensions.dart';
 
 class MailListItem extends StatelessWidget {
   const MailListItem(this.mail);
@@ -51,7 +51,7 @@ class MailListItem extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Padding(
-      padding: const EdgeInsets.only(top: Dimensions.listItemPaddingSmall),
+      padding: const EdgeInsets.only(top: listItemPaddingSmall),
       child: Row(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: <Widget>[
@@ -64,7 +64,7 @@ class MailListItem extends StatelessWidget {
           ),
           Expanded(
             child: Padding(
-              padding: EdgeInsets.symmetric(horizontal: Dimensions.listItemPadding),
+              padding: EdgeInsets.symmetric(horizontal: listItemPadding),
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: <Widget>[
@@ -92,7 +92,7 @@ class MailListItem extends StatelessWidget {
                     style: TextStyle(fontWeight: FontWeight.w500, fontSize: 18.0),
                   ),
                   Padding(
-                    padding: const EdgeInsets.only(top: Dimensions.listItemPaddingSmall),
+                    padding: const EdgeInsets.only(top: listItemPaddingSmall),
                     child: Text(
                       mail.message,
                       maxLines: 1,
@@ -101,7 +101,7 @@ class MailListItem extends StatelessWidget {
                     ),
                   ),
                   Padding(
-                    padding: const EdgeInsets.only(bottom: Dimensions.listItemPaddingSmall),
+                    padding: const EdgeInsets.only(bottom: listItemPaddingSmall),
                     child: Row(
                       mainAxisAlignment: MainAxisAlignment.start,
                       children: <Widget>[
diff --git a/lib/source/main/root.dart b/lib/source/main/root.dart
index c343f1fa..4b7e7d17 100644
--- a/lib/source/main/root.dart
+++ b/lib/source/main/root.dart
@@ -58,7 +58,7 @@ class _RootState extends State<Root> {
   var childList = List<BaseRootChild>();
 
   _RootState() {
-    childList.addAll([new ChatListView(), new MailListView(), new ContactListView(), new ProfileView()]);
+    childList.addAll([new ChatListView(), new ContactListView(), new ProfileView()]);
   }
 
   @override
diff --git a/lib/source/main/splash.dart b/lib/source/main/splash.dart
index e0fb4f37..bfba0be4 100644
--- a/lib/source/main/splash.dart
+++ b/lib/source/main/splash.dart
@@ -47,7 +47,7 @@ class Splash extends StatelessWidget {
   Widget build(BuildContext context) {
     return Scaffold(
       body: Center(
-        child: Text("LOADING"),
+        child: CircularProgressIndicator(),
       ),
     );
   }
diff --git a/lib/source/profile/edit_account_settings.dart b/lib/source/profile/edit_account_settings.dart
index 72d017ff..5c513f02 100644
--- a/lib/source/profile/edit_account_settings.dart
+++ b/lib/source/profile/edit_account_settings.dart
@@ -43,25 +43,17 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:ox_talk/source/form/validatable_text_form_field.dart';
+import 'package:ox_talk/source/data/config.dart';
+import 'package:ox_talk/source/widgets/validatable_text_form_field.dart';
 import 'package:ox_talk/source/l10n/localizations.dart';
-import 'package:ox_talk/source/profile/user.dart';
 import 'package:ox_talk/source/profile/user_bloc.dart';
 import 'package:ox_talk/source/profile/user_event.dart';
 import 'package:ox_talk/source/profile/user_state.dart';
-import 'package:ox_talk/source/ui/default_colors.dart';
+import 'package:ox_talk/source/utils/colors.dart';
+import 'package:ox_talk/source/utils/toast.dart';
+import 'package:rxdart/rxdart.dart';
 
 class EditAccountSettings extends StatefulWidget {
-  final String imapLogin;
-  final String imapServer;
-  final String imapPort;
-  final String smtpLogin;
-  final String smtpPassword;
-  final String smtpServer;
-  final String smtpPort;
-
-  EditAccountSettings({@required this.imapLogin, @required this.imapServer, @required this.imapPort, @required this.smtpLogin, @required this.smtpPassword, @required this.smtpServer, @required this.smtpPort});
-
   @override
   _EditAccountSettingsState createState() => _EditAccountSettingsState();
 }
@@ -70,130 +62,158 @@ class _EditAccountSettingsState extends State<EditAccountSettings> {
   UserBloc _userBloc = UserBloc();
 
   final _advancedLoginKey = GlobalKey<FormState>();
-  final imapLoginNameField = ValidatableTextFormField("IMAP login-name", "");
-  final imapServerField = ValidatableTextFormField("IMAP server", "");
-  final imapPortField = ValidatableTextFormField("IMAP port", "", textFormType: TextFormType.port, inputType: TextInputType.numberWithOptions());
-  final smtpLoginNameField = ValidatableTextFormField("SMTP login-name", "");
-  final smtpPasswordField = ValidatableTextFormField("SMTP password", "", textFormType: TextFormType.password, needValidation: false);
-  final smtpServerField = ValidatableTextFormField("SMTP server", "");
-  final smtpPortField = ValidatableTextFormField("SMTP port", "", textFormType: TextFormType.port, inputType: TextInputType.numberWithOptions());
-  List<String> _securityOptions = List();
+  ValidatableTextFormField imapLoginNameField = ValidatableTextFormField((context) => AppLocalizations.of(context).loginLabelImapName);
+  ValidatableTextFormField imapPasswordField = ValidatableTextFormField(
+    (context) => AppLocalizations.of(context).loginLabelImapPassword,
+    textFormType: TextFormType.password,
+    needValidation: false,
+  );
+  ValidatableTextFormField imapServerField = ValidatableTextFormField((context) => AppLocalizations.of(context).loginLabelImapServer);
+  ValidatableTextFormField imapPortField = ValidatableTextFormField(
+    (context) => AppLocalizations.of(context).loginLabelImapPort,
+    textFormType: TextFormType.port,
+    inputType: TextInputType.numberWithOptions(),
+  );
+  ValidatableTextFormField smtpLoginNameField = ValidatableTextFormField((context) => AppLocalizations.of(context).loginLabelSmtpName);
+  ValidatableTextFormField smtpPasswordField = ValidatableTextFormField(
+    (context) => AppLocalizations.of(context).loginLabelSmtpPassword,
+    textFormType: TextFormType.password,
+    needValidation: false,
+  );
+  ValidatableTextFormField smtpServerField = ValidatableTextFormField((context) => AppLocalizations.of(context).loginLabelSmtpServer);
+  ValidatableTextFormField smtpPortField = ValidatableTextFormField(
+    (context) => AppLocalizations.of(context).loginLabelSmtpPort,
+    textFormType: TextFormType.port,
+    inputType: TextInputType.numberWithOptions(),
+  );
   String _selectedImapSecurity;
   String _selectedSmtpSecurity;
 
   @override
-  void initState(){
+  void initState() {
     super.initState();
-    _securityOptions.addAll(["Automatic", "SSL/TLS", "StartTLS", "Off"]);
-    _selectedImapSecurity = _securityOptions.elementAt(0);
-    _selectedSmtpSecurity = _securityOptions.elementAt(0);
-
-    imapLoginNameField.controller.text = widget.imapLogin != null ? widget.imapLogin : "";
-    imapServerField.controller.text = widget.imapServer != null ? widget.imapServer : "";
-    imapPortField.controller.text = widget.imapPort != null  ? widget.imapPort : "";
-    smtpLoginNameField.controller.text = widget.smtpLogin != null ? widget.smtpLogin : "";
-    smtpPasswordField.controller.text = widget.smtpPassword != null ? widget.smtpPassword : "";
-    smtpServerField.controller.text = widget.smtpServer != null ? widget.smtpServer : "";
-    smtpPortField.controller.text = widget.smtpPort != null ? widget.smtpPort : "";
-
     _userBloc.dispatch(RequestUser());
+    final userStatesObservable = new Observable<UserState>(_userBloc.state);
+    userStatesObservable.listen((state) => _handleUserStateChange(state));
+  }
+
+  _handleUserStateChange(UserState state) {
+    if (state is UserStateSuccess) {
+      _fillEditAccountDataView(state.config);
+    }
   }
 
   @override
   Widget build(BuildContext context) {
     return Scaffold(
         appBar: AppBar(
-          backgroundColor: DefaultColors.contactColor,
+          leading: new IconButton(
+            icon: new Icon(Icons.close),
+            onPressed: () => Navigator.of(context).pop(),
+          ),
+          backgroundColor: contactMain,
           title: Text(AppLocalizations.of(context).editAccountSettingsTitle),
           actions: <Widget>[IconButton(icon: Icon(Icons.check), onPressed: saveAccountData)],
         ),
         body: buildForm());
   }
 
-  Widget buildForm(){
+  Widget buildForm() {
     return BlocBuilder(
         bloc: _userBloc,
-        builder: (context, state){
-          if(state is UserStateSuccess){
-            return buildEditAccountDataView();
-          }else if (state is UserStateFailure) {
-            return new Text(state.error);
-          } else {
-            return new Container();
+        builder: (context, state) {
+          if (state is UserStateFailure) {
+            showToast(state.error);
           }
-        }
-    );
+          return _buildEditAccountDataView();
+        });
+  }
+
+  _fillEditAccountDataView(Config config) {
+    imapLoginNameField.controller.text = config.imapLogin;
+    imapServerField.controller.text = config.imapServer;
+    imapPortField.controller.text = config.imapPortAsString;
+    smtpLoginNameField.controller.text = config.smtpLogin;
+    smtpServerField.controller.text = config.imapServer;
+    smtpPortField.controller.text = config.smtpPortAsString;
   }
 
-  Widget buildEditAccountDataView() {
+  Widget _buildEditAccountDataView() {
     return SingleChildScrollView(
-      padding: const EdgeInsets.all(20.0),
-      child: Form(
-        key: _advancedLoginKey,
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.stretch,
-          children: <Widget>[
-            Text("Inbox"),
-            imapLoginNameField,
-            imapServerField,
-            imapPortField,
-            Padding(padding: EdgeInsets.only(top: 12.0)),
-            Text("IMAP Security"),
-            DropdownButton(
-              value: _selectedImapSecurity,
-              items: _securityOptions.map<DropdownMenuItem<String>>((String value) {
-                return DropdownMenuItem<String>(value: value, child: Text(value));
-              }).toList(),
-              onChanged: (String newValue) {
-                setState(() {
-                  _selectedImapSecurity = newValue;
-                });
-              }),
-            Padding(padding: EdgeInsets.only(top: 12.0)),
-            Text("Outbox"),
-            smtpLoginNameField,
-            smtpPasswordField,
-            smtpServerField,
-            smtpPortField,
-            Padding(padding: EdgeInsets.only(top: 12.0)),
-            Text("SMTP Security"),
-            DropdownButton(
-              value: _selectedSmtpSecurity,
-              items: _securityOptions.map<DropdownMenuItem<String>>((String value) {
-                return DropdownMenuItem<String>(value: value, child: Text(value));
-              }).toList(),
-              onChanged: (String newValue) {
-                setState(() {
-                  _selectedSmtpSecurity = newValue;
-                });
-              }),
-          ],
-        ),
-      )
-    );
+        padding: const EdgeInsets.all(20.0),
+        child: Form(
+          key: _advancedLoginKey,
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.stretch,
+            children: <Widget>[
+              Text(AppLocalizations.of(context).inbox),
+              imapLoginNameField,
+              imapPasswordField,
+              imapServerField,
+              imapPortField,
+              Padding(padding: EdgeInsets.only(top: 12.0)),
+              Text(AppLocalizations.of(context).loginLabelImapSecurity),
+              DropdownButton(
+                  value: _selectedImapSecurity,
+                  items: getSecurityOptions(),
+                  onChanged: (String newValue) {
+                    setState(() {
+                      _selectedImapSecurity = newValue;
+                    });
+                  }),
+              Padding(padding: EdgeInsets.only(top: 12.0)),
+              Text(AppLocalizations.of(context).outbox),
+              smtpLoginNameField,
+              smtpPasswordField,
+              smtpServerField,
+              smtpPortField,
+              Padding(padding: EdgeInsets.only(top: 12.0)),
+              Text(AppLocalizations.of(context).loginLabelSmtpSecurity),
+              DropdownButton(
+                  value: _selectedSmtpSecurity,
+                  items: getSecurityOptions(),
+                  onChanged: (String newValue) {
+                    setState(() {
+                      _selectedSmtpSecurity = newValue;
+                    });
+                  }),
+            ],
+          ),
+        ));
   }
 
   saveAccountData() {
-    if(_advancedLoginKey.currentState.validate()){
+    if (_advancedLoginKey.currentState.validate()) {
       var imapLogin = imapLoginNameField.controller.text;
+      var imapPassword = imapPasswordField.controller.text;
       var imapServer = imapServerField.controller.text;
       var imapPort = imapPortField.controller.text;
       var smtpLogin = smtpLoginNameField.controller.text;
       var smtpPassword = smtpPasswordField.controller.text;
       var smtpServer = smtpServerField.controller.text;
       var smtpPort = smtpPortField.controller.text;
-      _userBloc.dispatch(
-        UserAccountDataChanged(
-          imapLogin: imapLogin,
-          imapServer: imapServer,
-          imapPort: imapPort.isNotEmpty ? int.parse(imapPort) : null,
-          smtpLogin: smtpLogin,
-          smtpPassword: smtpPassword,
-          smtpServer: smtpServer,
-          smtpPort: smtpPort.isNotEmpty ? int.parse(smtpPort) : null,
-        )
-      );
+      _userBloc.dispatch(UserAccountDataChanged(
+        imapLogin: imapLogin,
+        imapPassword: imapPassword,
+        imapServer: imapServer,
+        imapPort: imapPort.isNotEmpty ? int.parse(imapPort) : null,
+        smtpLogin: smtpLogin,
+        smtpPassword: smtpPassword,
+        smtpServer: smtpServer,
+        smtpPort: smtpPort.isNotEmpty ? int.parse(smtpPort) : null,
+      ));
       Navigator.pop(context);
     }
   }
+
+  List<DropdownMenuItem<String>> getSecurityOptions() {
+    return [
+      AppLocalizations.of(context).automatic,
+      AppLocalizations.of(context).sslTls,
+      AppLocalizations.of(context).startTLS,
+      AppLocalizations.of(context).off,
+    ].map<DropdownMenuItem<String>>((String value) {
+      return DropdownMenuItem<String>(value: value, child: Text(value));
+    }).toList();
+  }
 }
diff --git a/lib/source/profile/edit_user_settings.dart b/lib/source/profile/edit_user_settings.dart
index 5a9ac437..70dca87d 100644
--- a/lib/source/profile/edit_user_settings.dart
+++ b/lib/source/profile/edit_user_settings.dart
@@ -43,45 +43,37 @@
 import 'dart:async';
 import 'dart:io';
 
-import 'package:delta_chat_core/delta_chat_core.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+//import 'package:image_picker_ui/image_picker_handler.dart';
+import 'package:ox_talk/source/data/config.dart';
 import 'package:ox_talk/source/l10n/localizations.dart';
-import 'package:ox_talk/source/profile/user.dart';
 import 'package:ox_talk/source/profile/user_bloc.dart';
 import 'package:ox_talk/source/profile/user_event.dart';
 import 'package:ox_talk/source/profile/user_state.dart';
-import 'package:ox_talk/source/ui/default_colors.dart';
-import 'package:image_picker_ui/image_picker_handler.dart';
-import 'package:ox_talk/source/ui/dimensions.dart';
+import 'package:ox_talk/source/utils/colors.dart';
+import 'package:ox_talk/source/utils/dimensions.dart';
 import 'package:path_provider/path_provider.dart';
+import 'package:rxdart/rxdart.dart';
 
 class EditUserSettings extends StatefulWidget {
-//  static const String USERNAME_RESULT = "username_result";
-//  static const String STATUS_RESULT = "status_result";
-  final String username;
-  final String avatarPath;
-  final String status;
-
-  EditUserSettings({@required this.avatarPath, @required this.username, @required this.status});
-
   @override
   _EditUserSettingsState createState() => _EditUserSettingsState();
 }
 
-class _EditUserSettingsState extends State<EditUserSettings> with TickerProviderStateMixin, ImagePickerListener {
+class _EditUserSettingsState extends State<EditUserSettings> with TickerProviderStateMixin {//, ImagePickerListener {
   UserBloc _userBloc = UserBloc();
 
   TextEditingController _usernameController = TextEditingController();
   TextEditingController _statusController = TextEditingController();
 
   File _image;
-  AnimationController _controller;
-  ImagePickerHandler _imagePicker;
   String _path = "";
+  AnimationController _controller;
+  //ImagePickerHandler _imagePicker;
 
   @override
-  void initState(){
+  void initState() {
     super.initState();
     _userBloc.dispatch(RequestUser());
     _controller = new AnimationController(
@@ -89,41 +81,52 @@ class _EditUserSettingsState extends State<EditUserSettings> with TickerProvider
       duration: const Duration(milliseconds: 500),
     );
 
-    _imagePicker = new ImagePickerHandler(this, _controller);
-    _imagePicker.init();
+    //_imagePicker = new ImagePickerHandler(this, _controller);
+    //_imagePicker.build(0xFFEE6969,0xFFFFFFFF,false);
 
-    _usernameController.text = widget.username != null ? widget.username : "";
-    _statusController.text = widget.status != null ? widget.status : "";
-    _path = widget.avatarPath;
+    final userStatesObservable = new Observable<UserState>(_userBloc.state);
+    userStatesObservable.listen((state) => _handleUserStateChange(state));
+  }
+
+  _handleUserStateChange(UserState state) {
+    if (state is UserStateSuccess) {
+      Config config = state.config;
+      _usernameController.text = config.username;
+      _statusController.text = config.status;
+      _path = config.avatarPath;
+    }
   }
 
   @override
   Widget build(BuildContext context) {
     return Scaffold(
         appBar: AppBar(
-          backgroundColor: DefaultColors.contactColor,
+          leading: new IconButton(
+            icon: new Icon(Icons.close),
+            onPressed: () => Navigator.of(context).pop(),
+          ),
+          backgroundColor: contactMain,
           title: Text(AppLocalizations.of(context).editUserSettingsTitle),
           actions: <Widget>[IconButton(icon: Icon(Icons.check), onPressed: saveChanges)],
         ),
         body: buildForm());
   }
 
-  Widget buildForm(){
+  Widget buildForm() {
     return BlocBuilder(
         bloc: _userBloc,
-        builder: (context, state){
-          if(state is UserStateSuccess){
-            return buildEditUserDataView(state.user);
-          }else if (state is UserStateFailure) {
+        builder: (context, state) {
+          if (state is UserStateSuccess) {
+            return buildEditUserDataView(state.config);
+          } else if (state is UserStateFailure) {
             return new Text(state.error);
           } else {
             return new Container();
           }
-        }
-    );
+        });
   }
 
-  Widget buildEditUserDataView(User user) {
+  Widget buildEditUserDataView(Config config) {
     return SingleChildScrollView(
       child: Center(
         child: Column(
@@ -131,50 +134,44 @@ class _EditUserSettingsState extends State<EditUserSettings> with TickerProvider
           children: <Widget>[
             Padding(padding: EdgeInsets.only(top: 24.0)),
             new GestureDetector(
-              onTap: () => _imagePicker.showDialog(context),
-              child: Stack(
-                children: <Widget>[
-                  _path.isNotEmpty ?
-                  CircleAvatar(
-                    maxRadius: Dimensions.profileAvatarMaxRadius,
-                    backgroundImage: FileImage(File('$_path')),
-                  ) :
-                  CircleAvatar(
-                    maxRadius: Dimensions.profileAvatarMaxRadius,
-                    child: Icon(
-                      Icons.person,
-                      size: 60.0,
+                onTap: () => null,//_imagePicker.showDialog(context),
+                child: Stack(
+                  children: <Widget>[
+                    _path.isNotEmpty
+                        ? CircleAvatar(
+                            maxRadius: profileAvatarMaxRadius,
+                            backgroundImage: FileImage(File('$_path')),
+                          )
+                        : CircleAvatar(
+                            maxRadius: profileAvatarMaxRadius,
+                            child: Icon(
+                              Icons.person,
+                              size: 60.0,
+                            ),
+                          ),
+                    CircleAvatar(
+                      maxRadius: profileAvatarMaxRadius,
+                      backgroundColor: Colors.black26,
+                      child: Icon(
+                        Icons.edit,
+                        size: editAvatarIconSize,
+                        color: Colors.white,
+                      ),
                     ),
-                  ),
-                  CircleAvatar(
-                    maxRadius: Dimensions.profileAvatarMaxRadius,
-                    backgroundColor: Colors.black26,
-                    child: Icon(
-                      Icons.edit,
-                      size: Dimensions.editAvatarIconSize,
-                      color: Colors.white,
-                    ),
-                  ),
-                ],
-              )
-            ),
+                  ],
+                )),
             Padding(
-              padding: EdgeInsets.only(left: Dimensions.defaultBorderPadding, right: Dimensions.defaultBorderPadding),
+              padding: EdgeInsets.only(left: defaultBorderPadding, right: defaultBorderPadding),
               child: Column(
                 children: <Widget>[
                   TextFormField(
-                    maxLines: 1,
-                    controller: _usernameController,
-                    decoration: InputDecoration(
-                        labelText: AppLocalizations.of(context).editUserSettingsUsernameLabel
-                    )
-                  ),
+                      maxLines: 1,
+                      controller: _usernameController,
+                      decoration: InputDecoration(labelText: AppLocalizations.of(context).editUserSettingsUsernameLabel)),
                   TextFormField(
                     maxLines: 1,
                     controller: _statusController,
-                    decoration: InputDecoration(
-                        labelText: AppLocalizations.of(context).editUserSettingsStatusLabel
-                    ),
+                    decoration: InputDecoration(labelText: AppLocalizations.of(context).editUserSettingsStatusLabel),
                   ),
                 ],
               ),
@@ -205,11 +202,11 @@ class _EditUserSettingsState extends State<EditUserSettings> with TickerProvider
   }
 
   void saveChanges() async {
-    if(_image != null) {
+    if (_image != null) {
       _path = await saveImage(_image);
     }
 
-  _userBloc.dispatch(UserPersonalDataChanged(username: _usernameController.text, status: _statusController.text, avatarPath: _path));
+    _userBloc.dispatch(UserPersonalDataChanged(username: _usernameController.text, status: _statusController.text, avatarPath: _path));
 
     Navigator.pop(context);
   }
diff --git a/lib/source/profile/profile.dart b/lib/source/profile/profile.dart
index 9a722470..7bc0477c 100644
--- a/lib/source/profile/profile.dart
+++ b/lib/source/profile/profile.dart
@@ -42,27 +42,31 @@
 
 import 'dart:io';
 
-import 'package:delta_chat_core/delta_chat_core.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:ox_talk/main.dart';
 import 'package:ox_talk/source/base/base_root_child.dart';
+import 'package:ox_talk/source/data/config.dart';
 import 'package:ox_talk/source/l10n/localizations.dart';
-import 'package:ox_talk/source/profile/edit_account_settings.dart';
 import 'package:ox_talk/source/profile/edit_user_settings.dart';
-import 'package:ox_talk/source/profile/user.dart';
 import 'package:ox_talk/source/profile/user_bloc.dart';
 import 'package:ox_talk/source/profile/user_event.dart';
 import 'package:ox_talk/source/profile/user_state.dart';
-import 'package:ox_talk/source/ui/default_colors.dart';
+import 'package:ox_talk/source/utils/colors.dart';
+import 'package:ox_talk/source/utils/dimensions.dart';
+import 'package:ox_talk/source/utils/widget.dart';
 
 class ProfileView extends BaseRootChild {
-
-  _ProfileState createState() => _ProfileState();
+  @override
+  _ProfileState createState() {
+    final state = _ProfileState();
+    addActions([state.getAccountSettingsAction()]);
+    return state;
+  }
 
   @override
   Color getColor() {
-    return DefaultColors.profileColor;
+    return profileMain;
   }
 
   @override
@@ -84,14 +88,13 @@ class ProfileView extends BaseRootChild {
   IconData getNavigationIcon() {
     return Icons.account_circle;
   }
-
 }
 
 class _ProfileState extends State<ProfileView> {
   UserBloc _userBloc = UserBloc();
 
   @override
-  void initState(){
+  void initState() {
     super.initState();
     _userBloc.dispatch(RequestUser());
   }
@@ -99,112 +102,97 @@ class _ProfileState extends State<ProfileView> {
   @override
   Widget build(BuildContext context) {
     return BlocBuilder(
-      bloc: _userBloc,
-      builder: (context, state){
-        if(state is UserStateSuccess){
-          return buildProfileView(state.user);
-        }else if (state is UserStateFailure) {
-          return new Text(state.error);
-        } else {
-          return new Container();
-        }
-      }
-    );
+        bloc: _userBloc,
+        builder: (context, state) {
+          if (state is UserStateSuccess) {
+            return buildProfileView(state.config);
+          } else if (state is UserStateFailure) {
+            return new Text(state.error);
+          } else {
+            return new Container();
+          }
+        });
   }
 
-  Widget buildProfileView(User user){
-    return SingleChildScrollView(
-      child: Center(
+  Widget buildProfileView(Config config) {
+    return Container(
+      constraints: BoxConstraints.expand(),
+      child: SingleChildScrollView(
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.center,
           children: <Widget>[
-            Padding(padding: EdgeInsets.only(top: 24.0)),
-            user.avatarPath.isEmpty ? CircleAvatar(
-              maxRadius: 45,
-              child: Icon(
-                Icons.person,
-                size: 60,
-              ),
-            ):
-            CircleAvatar(
-              maxRadius: 45,
-              backgroundImage: FileImage(File(user.avatarPath)),
+            Padding(
+              padding: EdgeInsets.symmetric(vertical: 24.0),
+              child: buildAvatar(config),
             ),
-            Padding(padding: EdgeInsets.only(top: 12.0)),
-            user.username.isNotEmpty ? Text(
-              user.username,
-              style: TextStyle(
-                  fontSize: 24
-              ),
-            ) : Container(),
-            Padding(padding: EdgeInsets.only(top: 12.0)),
-            user.email.isNotEmpty ? Text(
-              user.email,
-              style: TextStyle(
-                  fontSize: 14,
-                  fontWeight: FontWeight.w600
-              ),
-            ) : Container(),
-            Padding(padding: EdgeInsets.only(top: 12.0)),
-            user.status.isNotEmpty ? Text(
-              user.status,
-              style: TextStyle(
-                fontSize: 16,
-              ),
-            ) : Text(
-              AppLocalizations.of(context).profileStatusPlaceholder,
-              style: TextStyle(
-                fontSize: 16,
-              ),
+            getTextOrPlaceHolder(
+              text: config.username,
+              style: TextStyle(fontSize: 24),
+              align: TextAlign.center,
+              placeholderText: AppLocalizations.of(context).profileUsernamePlaceholder,
+              placeholderStyle: TextStyle(fontSize: 24, color: textDisabled),
+              placeHolderAlign: TextAlign.center,
             ),
-            Padding(padding: EdgeInsets.only(top: 16.0)),
-            RaisedButton(
-              onPressed: () => editUserSettings(user.avatarPath, user.username, user.status),
+            Padding(
+              padding: const EdgeInsets.only(top: 8.0),
               child: Text(
-                  "Edit user settings" //No translation because design is not ready and maybe there is no button with text
+                config.email,
+                style: TextStyle(fontSize: 16),
               ),
             ),
-            RaisedButton(
-              onPressed: () => editAccountSettings(user),
-              child: Text(
-                  "Edit account settings" //No translation because design is not ready and maybe there is no button with text
+            Padding(
+              padding: const EdgeInsets.symmetric(vertical: 36.0),
+              child: getTextOrPlaceHolder(
+                text: config.status,
+                align: TextAlign.center,
+                style: TextStyle(fontSize: 16),
+                placeholderText: AppLocalizations.of(context).profileStatusPlaceholder,
+                placeholderStyle: TextStyle(fontSize: 16, color: textDisabled),
+                placeHolderAlign: TextAlign.center,
               ),
-            )
+            ),
+            buildOutlineButton(
+              context: context,
+              color: Theme.of(context).primaryColor,
+              child: Text(AppLocalizations.of(context).profileEditButton),
+              onPressed: editUserSettings,
+            ),
           ],
         ),
       ),
     );
   }
 
-  editUserSettings(String avatarPath, String username, String status) async{
-    Navigator.push(
-      context,
-      MaterialPageRoute(
-        builder: (context) => EditUserSettings(
-          avatarPath: avatarPath,
-          username: username,
-          status: status,
-        )
-      ),
+  CircleAvatar buildAvatar(Config user) {
+    return user.avatarPath.isEmpty
+        ? CircleAvatar(
+            maxRadius: profileAvatarMaxRadius,
+            child: Icon(
+              Icons.person,
+              size: 60,
+            ),
+          )
+        : CircleAvatar(
+            maxRadius: profileAvatarMaxRadius,
+            backgroundImage: FileImage(File(user.avatarPath)),
+          );
+  }
+
+  Widget getAccountSettingsAction() {
+    return IconButton(
+      icon: Icon(Icons.settings),
+      onPressed: () => _editAccountSettings(context),
     );
+  }
 
+  _editAccountSettings(BuildContext context) {
+    Navigator.pushNamed(context, OxTalkApp.ROUTES_PROFILE_EDIT);
   }
 
-  //TODO: call editAccountSettings screen
-  editAccountSettings(User user) {
+  editUserSettings() {
     Navigator.push(
       context,
-      MaterialPageRoute(
-        builder: (context) => EditAccountSettings(
-          imapLogin: user.imapLogin,
-          imapServer: user.imapServer,
-          imapPort: user.imapPort,
-          smtpLogin: user.smtpLogin,
-          smtpPassword: user.smtpPassword,
-          smtpServer: user.smtpServer,
-          smtpPort: user.smtpPort,
-        )
-    ),);
+      MaterialPageRoute(builder: (context) => EditUserSettings()),
+    );
   }
-
-}
\ No newline at end of file
+}
diff --git a/lib/source/profile/user_bloc.dart b/lib/source/profile/user_bloc.dart
index abd7aed9..fe48f7e3 100644
--- a/lib/source/profile/user_bloc.dart
+++ b/lib/source/profile/user_bloc.dart
@@ -40,18 +40,15 @@
  * for more details.
  */
 
+import 'dart:async';
+
 import 'package:bloc/bloc.dart';
 import 'package:delta_chat_core/delta_chat_core.dart';
+import 'package:ox_talk/source/data/config.dart';
 import 'package:ox_talk/source/profile/user_event.dart';
 import 'package:ox_talk/source/profile/user_state.dart';
-import 'package:ox_talk/source/data/repository.dart';
-import 'package:ox_talk/source/data/repository_manager.dart';
-import 'package:ox_talk/source/profile/user.dart';
 
 class UserBloc extends Bloc<UserEvent, UserState> {
-  Context _context = Context();
-
-  final Repository<User> userRepository = RepositoryManager.get(RepositoryType.user);
   @override
   UserState get initialState => UserStateInitial();
 
@@ -64,21 +61,17 @@ class UserBloc extends Bloc<UserEvent, UserState> {
       } catch (error) {
         yield UserStateFailure(error: error.toString());
       }
-    }
-    else if (event is UserLoaded) {
-      yield UserStateSuccess(user: userRepository.get(1));
-    }
-    else if(event is UserChanged){
-      yield UserStateSuccess(user: userRepository.get(1));
-    }
-    else if (event is UserPersonalDataChanged) {
+    } else if (event is UserLoaded) {
+      yield UserStateSuccess(config: event.config);
+    } else if (event is UserChanged) {
+      yield UserStateSuccess(config: event.config);
+    } else if (event is UserPersonalDataChanged) {
       try {
         _saveUserPersonalData(event);
       } catch (error) {
         yield UserStateFailure(error: error.toString());
       }
-    }
-    else if (event is UserAccountDataChanged) {
+    } else if (event is UserAccountDataChanged) {
       try {
         _saveUserAccountData(event);
       } catch (error) {
@@ -88,58 +81,29 @@ class UserBloc extends Bloc<UserEvent, UserState> {
   }
 
   void _setupUser() async {
-    User user = new User();
-    user.username = await _context.getConfigValue(Context.configDisplayName);
-    user.avatarPath = await _context.getConfigValue(Context.configSelfAvatar);
-    user.status = await _context.getConfigValue(Context.configSelfStatus);
-    user.email = await _context.getConfigValue(Context.configAddress);
-    user.imapLogin = await _context.getConfigValue(Context.configMailUser);
-    user.imapServer = await _context.getConfigValue(Context.configMailServer);
-    user.imapPort = await _context.getConfigValue(Context.configMailPort);
-    user.smtpLogin = await _context.getConfigValue(Context.configSendUser);
-    user.smtpPassword = await _context.getConfigValue(Context.configSendPassword);
-    user.smtpServer = await _context.getConfigValue(Context.configSendServer);
-    user.smtpPort = await _context.getConfigValue(Context.configSendPort);
-    userRepository.putIfAbsent(id: user.id);
-    dispatch(UserLoaded());
+    Config config = Config();
+    await config.load();
+    dispatch(UserLoaded(config: config));
   }
 
   void _saveUserPersonalData(UserPersonalDataChanged event) {
-    User user = userRepository.get(1);
-    _context.setConfigValue(Context.configDisplayName, event.username);
-    _context.setConfigValue(Context.configSelfStatus, event.status);
-    _context.setConfigValue(Context.configSelfAvatar, event.avatarPath);
-    user.username = event.username;
-    user.status = event.status;
-    user.avatarPath = event.avatarPath;
-    dispatch(UserChanged());
+    Config config = Config();
+    config.setValue(Context.configDisplayName, event.username, true);
+    config.setValue(Context.configSelfStatus, event.status, true);
+    config.setValue(Context.configSelfAvatar, event.avatarPath, true);
+    dispatch(UserChanged(config: config));
   }
 
   void _saveUserAccountData(UserAccountDataChanged event) {
-    User user = userRepository.get(1);
-    setConfigValueIfPresent(Context.configMailUser, event.imapLogin);
-    setConfigValueIfPresent(Context.configMailServer, event.imapServer);
-    setConfigValueIfPresent(Context.configMailPort, event.imapPort.toString());
-    setConfigValueIfPresent(Context.configSendUser, event.smtpLogin);
-    setConfigValueIfPresent(Context.configSendPassword, event.smtpPassword);
-    setConfigValueIfPresent(Context.configSendServer, event.smtpServer);
-    setConfigValueIfPresent(Context.configSendPort, event.smtpPort.toString());
-
-    user.imapLogin = event.imapLogin;
-    user.imapServer = event.imapServer;
-    user.imapPort = event.imapPort != null ? event.imapPort.toString() : "";
-    user.smtpLogin = event.smtpLogin;
-    user.smtpPassword = event.smtpPassword;
-    user.smtpServer = event.smtpServer;
-    user.smtpPort = event.smtpPort != null ? event.smtpPort.toString() : "";
-
-    dispatch(UserChanged());
-  }
-
-  void setConfigValueIfPresent(String key, var value) async {
-    if (value == null || (value is String && value.isEmpty)) {
-      return;
-    }
-    await _context.setConfigValue(key, value);
+    Config config = Config();
+    config.setValue(Context.configMailUser, event.imapLogin, true);
+    config.setValue(Context.configMailPassword, event.imapPassword, true);
+    config.setValue(Context.configMailServer, event.imapServer, true);
+    config.setValue(Context.configMailPort, event.imapPort, true);
+    config.setValue(Context.configSendUser, event.smtpLogin, true);
+    config.setValue(Context.configSendPassword, event.smtpPassword, true);
+    config.setValue(Context.configSendServer, event.smtpServer, true);
+    config.setValue(Context.configSendPort, event.smtpPort, true);
+    dispatch(UserChanged(config: config));
   }
 }
diff --git a/lib/source/profile/user_event.dart b/lib/source/profile/user_event.dart
index 2a652f78..63181b50 100644
--- a/lib/source/profile/user_event.dart
+++ b/lib/source/profile/user_event.dart
@@ -41,13 +41,17 @@
  */
 
 import 'package:meta/meta.dart';
-import 'package:ox_talk/source/profile/user.dart';
+import 'package:ox_talk/source/data/config.dart';
 
 abstract class UserEvent {}
 
 class RequestUser extends UserEvent {}
 
-class UserLoaded extends UserEvent{}
+class UserLoaded extends UserEvent {
+  final Config config;
+
+  UserLoaded({@required this.config});
+}
 
 class UserPersonalDataChanged extends UserEvent {
   final String username;
@@ -58,9 +62,8 @@ class UserPersonalDataChanged extends UserEvent {
 }
 
 class UserAccountDataChanged extends UserEvent {
-//  final String email;
-//  final String password;
   final String imapLogin;
+  final String imapPassword;
   final String imapServer;
   final int imapPort;
   final String smtpLogin;
@@ -68,16 +71,19 @@ class UserAccountDataChanged extends UserEvent {
   final String smtpServer;
   final int smtpPort;
 
-  UserAccountDataChanged({
-//    @required this.email,
-//    @required this.password,
-    @required this.imapLogin,
-    @required this.imapServer,
-    @required this.imapPort,
-    @required this.smtpLogin,
-    @required this.smtpPassword,
-    @required this.smtpServer,
-    @required this.smtpPort});
+  UserAccountDataChanged(
+      {@required this.imapLogin,
+      @required this.imapPassword,
+      @required this.imapServer,
+      @required this.imapPort,
+      @required this.smtpLogin,
+      @required this.smtpPassword,
+      @required this.smtpServer,
+      @required this.smtpPort});
 }
 
-class UserChanged extends UserEvent {}
\ No newline at end of file
+class UserChanged extends UserEvent {
+  final Config config;
+
+  UserChanged({@required this.config});
+}
diff --git a/lib/source/profile/user_state.dart b/lib/source/profile/user_state.dart
index f251882a..354843bc 100644
--- a/lib/source/profile/user_state.dart
+++ b/lib/source/profile/user_state.dart
@@ -42,56 +42,56 @@
 
 import 'package:meta/meta.dart';
 import 'package:ox_talk/source/base/bloc_base_state.dart';
-import 'package:ox_talk/source/profile/user.dart';
+import 'package:ox_talk/source/data/config.dart';
 
 abstract class UserState extends BaseState {
-  final User user;
+  final Config config;
 
   UserState({
     @required isLoading,
     @required isSuccess,
     @required error,
-    @required this.user,
+    @required this.config,
   }) : super(isLoading: isLoading, isSuccess: isSuccess, error: error);
 }
 
 class UserStateInitial extends UserState {
   UserStateInitial()
       : super(
-    isLoading: false,
-    isSuccess: false,
-    error: '',
-    user: null
-  );
+          isLoading: false,
+          isSuccess: false,
+          error: '',
+          config: null,
+        );
 }
 
 class UserStateLoading extends UserState {
   UserStateLoading()
       : super(
-    isLoading: true,
-    isSuccess: false,
-    error: '',
-    user: null
-  );
+          isLoading: true,
+          isSuccess: false,
+          error: '',
+          config: null,
+        );
 }
 
 class UserStateSuccess extends UserState {
-  UserStateSuccess({@required User user})
+  UserStateSuccess({@required Config config})
       : super(
-    isLoading: false,
-    isSuccess: true,
-    error: '',
-    user: user
-  );
+          isLoading: false,
+          isSuccess: true,
+          error: '',
+          config: config,
+        );
 }
 
 class UserStateFailure extends UserState {
   UserStateFailure({
     @required error,
   }) : super(
-    isLoading: false,
-    isSuccess: false,
-    error: error,
-    user: null
-  );
-}
\ No newline at end of file
+          isLoading: false,
+          isSuccess: false,
+          error: error,
+          config: null,
+        );
+}
diff --git a/lib/source/utils/colors.dart b/lib/source/utils/colors.dart
new file mode 100644
index 00000000..44bd5e73
--- /dev/null
+++ b/lib/source/utils/colors.dart
@@ -0,0 +1,71 @@
+/*
+ * OPEN-XCHANGE legal information
+ *
+ * All intellectual property rights in the Software are protected by
+ * international copyright laws.
+ *
+ *
+ * In some countries OX, OX Open-Xchange and open xchange
+ * as well as the corresponding Logos OX Open-Xchange and OX are registered
+ * trademarks of the OX Software GmbH group of companies.
+ * The use of the Logos is not covered by the Mozilla Public License 2.0 (MPL 2.0).
+ * Instead, you are allowed to use these Logos according to the terms and
+ * conditions of the Creative Commons License, Version 2.5, Attribution,
+ * Non-commercial, ShareAlike, and the interpretation of the term
+ * Non-commercial applicable to the aforementioned license is published
+ * on the web site https://www.open-xchange.com/terms-and-conditions/.
+ *
+ * Please make sure that third-party modules and libraries are used
+ * according to their respective licenses.
+ *
+ * Any modifications to this package must retain all copyright notices
+ * of the original copyright holder(s) for the original code used.
+ *
+ * After any such modifications, the original and derivative code shall remain
+ * under the copyright of the copyright holder(s) and/or original author(s) as stated here:
+ * https://www.open-xchange.com/legal/. The contributing author shall be
+ * given Attribution for the derivative code and a license granting use.
+ *
+ * Copyright (C) 2016-2020 OX Software GmbH
+ * Mail: info@open-xchange.com
+ *
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the Mozilla Public License 2.0
+ * for more details.
+ */
+
+import 'dart:ui';
+
+import 'package:flutter/material.dart';
+
+const Color chatMain = Colors.blue;
+const Color mailMain = Colors.indigo;
+const Color contactMain = Colors.blueGrey;
+const Color profileMain = contactMain;
+
+const Color textDisabled = Colors.black26;
+
+Color rgbColorFromInt(int color, [int alpha]) {
+  if (alpha == null) {
+    alpha = 255;
+  }
+  return Color.fromARGB(alpha, _red(color), _green(color), _blue(color));
+}
+
+int _red(int color) {
+  return (color >> 16) & 0xFF;
+}
+
+int _green(int color) {
+  return (color >> 8) & 0xFF;
+}
+
+int _blue(int color) {
+  return color & 0xFF;
+}
diff --git a/lib/source/data/user_repository.dart b/lib/source/utils/conversion.dart
similarity index 82%
rename from lib/source/data/user_repository.dart
rename to lib/source/utils/conversion.dart
index 63173657..02359690 100644
--- a/lib/source/data/user_repository.dart
+++ b/lib/source/utils/conversion.dart
@@ -40,19 +40,21 @@
  * for more details.
  */
 
-import 'package:delta_chat_core/delta_chat_core.dart';
-import 'package:ox_talk/source/data/repository.dart';
-import 'package:ox_talk/source/profile/user.dart';
+const _kilobyte = 1024;
+const _megabyte = 1024 * _kilobyte;
 
-class UserRepository extends Repository<User> {
-  UserRepository(RepositoryItemCreator creator) : super(creator);
-  @override
-  success(Event event) {
-    super.success(event);
-  }
-
-  @override
-  error(error) {
-    super.error(error);
+String byteToPrintableSize(int size) {
+  String unit;
+  double result;
+  if (size < _kilobyte) {
+    result = size as double;
+    unit = "Byte";
+  } else if (size < _megabyte) {
+    result = size / _kilobyte;
+    unit = "KB";
+  } else {
+    result = size / _megabyte;
+    unit = "MB";
   }
+  return "${result.toStringAsFixed(2)} $unit";
 }
\ No newline at end of file
diff --git a/lib/source/utils/date.dart b/lib/source/utils/date.dart
new file mode 100644
index 00000000..8169964e
--- /dev/null
+++ b/lib/source/utils/date.dart
@@ -0,0 +1,47 @@
+/*
+ * OPEN-XCHANGE legal information
+ *
+ * All intellectual property rights in the Software are protected by
+ * international copyright laws.
+ *
+ *
+ * In some countries OX, OX Open-Xchange and open xchange
+ * as well as the corresponding Logos OX Open-Xchange and OX are registered
+ * trademarks of the OX Software GmbH group of companies.
+ * The use of the Logos is not covered by the Mozilla Public License 2.0 (MPL 2.0).
+ * Instead, you are allowed to use these Logos according to the terms and
+ * conditions of the Creative Commons License, Version 2.5, Attribution,
+ * Non-commercial, ShareAlike, and the interpretation of the term
+ * Non-commercial applicable to the aforementioned license is published
+ * on the web site https://www.open-xchange.com/terms-and-conditions/.
+ *
+ * Please make sure that third-party modules and libraries are used
+ * according to their respective licenses.
+ *
+ * Any modifications to this package must retain all copyright notices
+ * of the original copyright holder(s) for the original code used.
+ *
+ * After any such modifications, the original and derivative code shall remain
+ * under the copyright of the copyright holder(s) and/or original author(s) as stated here:
+ * https://www.open-xchange.com/legal/. The contributing author shall be
+ * given Attribution for the derivative code and a license granting use.
+ *
+ * Copyright (C) 2016-2020 OX Software GmbH
+ * Mail: info@open-xchange.com
+ *
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the Mozilla Public License 2.0
+ * for more details.
+ */
+
+import 'package:date_format/date_format.dart';
+
+String getTimeFromTimestamp(int timestamp) {
+  return formatDate(DateTime.fromMillisecondsSinceEpoch(timestamp), [HH, ':', nn]);
+}
diff --git a/lib/source/ui/dimensions.dart b/lib/source/utils/dimensions.dart
similarity index 86%
rename from lib/source/ui/dimensions.dart
rename to lib/source/utils/dimensions.dart
index 0277b608..b9855130 100644
--- a/lib/source/ui/dimensions.dart
+++ b/lib/source/utils/dimensions.dart
@@ -32,7 +32,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. 
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
@@ -40,15 +40,12 @@
  * for more details.
  */
 
-class Dimensions {
+const listItemPadding = 8.0;
 
-  static const listItemPadding = 8.0;
+const listItemPaddingSmall = 4.0;
 
-  static const listItemPaddingSmall = 4.0;
+const defaultBorderPadding = 20.0;
 
-  static const defaultBorderPadding = 20.0;
+const profileAvatarMaxRadius = 64.0;
 
-  static const profileAvatarMaxRadius = 45.0;
-
-  static const editAvatarIconSize = 40.0;
-}
\ No newline at end of file
+const editAvatarIconSize = 40.0;
diff --git a/lib/source/error/error.dart b/lib/source/utils/error.dart
similarity index 93%
rename from lib/source/error/error.dart
rename to lib/source/utils/error.dart
index a699f701..c346c7b1 100644
--- a/lib/source/error/error.dart
+++ b/lib/source/utils/error.dart
@@ -32,7 +32,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. 
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
@@ -40,8 +40,4 @@
  * for more details.
  */
 
-class Error {
-
-  static const contactDelete = "contact-delete-1";
-
-}
\ No newline at end of file
+const contactDelete = "contact-delete-1";
diff --git a/lib/source/ui/styles.dart b/lib/source/utils/styles.dart
similarity index 90%
rename from lib/source/ui/styles.dart
rename to lib/source/utils/styles.dart
index c3c971d2..78924bb0 100644
--- a/lib/source/ui/styles.dart
+++ b/lib/source/utils/styles.dart
@@ -42,14 +42,10 @@
 
 import 'package:flutter/material.dart';
 
-class TextStyles {
-
-  static const progress = TextStyle(
-    color: Colors.white,
-    fontSize: 14.0,
-    fontFamily: "Roboto",
-    fontWeight: FontWeight.normal,
-    decoration: TextDecoration.none,
-  );
-
-}
\ No newline at end of file
+const progressText = TextStyle(
+  color: Colors.white,
+  fontSize: 14.0,
+  fontFamily: "Roboto",
+  fontWeight: FontWeight.normal,
+  decoration: TextDecoration.none,
+);
diff --git a/lib/source/utils/toast.dart b/lib/source/utils/toast.dart
new file mode 100644
index 00000000..8bf73774
--- /dev/null
+++ b/lib/source/utils/toast.dart
@@ -0,0 +1,51 @@
+/*
+ * OPEN-XCHANGE legal information
+ *
+ * All intellectual property rights in the Software are protected by
+ * international copyright laws.
+ *
+ *
+ * In some countries OX, OX Open-Xchange and open xchange
+ * as well as the corresponding Logos OX Open-Xchange and OX are registered
+ * trademarks of the OX Software GmbH group of companies.
+ * The use of the Logos is not covered by the Mozilla Public License 2.0 (MPL 2.0).
+ * Instead, you are allowed to use these Logos according to the terms and
+ * conditions of the Creative Commons License, Version 2.5, Attribution,
+ * Non-commercial, ShareAlike, and the interpretation of the term
+ * Non-commercial applicable to the aforementioned license is published
+ * on the web site https://www.open-xchange.com/terms-and-conditions/.
+ *
+ * Please make sure that third-party modules and libraries are used
+ * according to their respective licenses.
+ *
+ * Any modifications to this package must retain all copyright notices
+ * of the original copyright holder(s) for the original code used.
+ *
+ * After any such modifications, the original and derivative code shall remain
+ * under the copyright of the copyright holder(s) and/or original author(s) as stated here:
+ * https://www.open-xchange.com/legal/. The contributing author shall be
+ * given Attribution for the derivative code and a license granting use.
+ *
+ * Copyright (C) 2016-2020 OX Software GmbH
+ * Mail: info@open-xchange.com
+ *
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the Mozilla Public License 2.0
+ * for more details.
+ */
+
+import 'package:fluttertoast/fluttertoast.dart';
+
+showToast(String message) {
+  Fluttertoast.showToast(
+    msg: message,
+    toastLength: Toast.LENGTH_LONG,
+    timeInSecForIos: 4,
+  );
+}
\ No newline at end of file
diff --git a/lib/source/utils/widget.dart b/lib/source/utils/widget.dart
new file mode 100644
index 00000000..d48aeb27
--- /dev/null
+++ b/lib/source/utils/widget.dart
@@ -0,0 +1,79 @@
+/*
+ * OPEN-XCHANGE legal information
+ *
+ * All intellectual property rights in the Software are protected by
+ * international copyright laws.
+ *
+ *
+ * In some countries OX, OX Open-Xchange and open xchange
+ * as well as the corresponding Logos OX Open-Xchange and OX are registered
+ * trademarks of the OX Software GmbH group of companies.
+ * The use of the Logos is not covered by the Mozilla Public License 2.0 (MPL 2.0).
+ * Instead, you are allowed to use these Logos according to the terms and
+ * conditions of the Creative Commons License, Version 2.5, Attribution,
+ * Non-commercial, ShareAlike, and the interpretation of the term
+ * Non-commercial applicable to the aforementioned license is published
+ * on the web site https://www.open-xchange.com/terms-and-conditions/.
+ *
+ * Please make sure that third-party modules and libraries are used
+ * according to their respective licenses.
+ *
+ * Any modifications to this package must retain all copyright notices
+ * of the original copyright holder(s) for the original code used.
+ *
+ * After any such modifications, the original and derivative code shall remain
+ * under the copyright of the copyright holder(s) and/or original author(s) as stated here:
+ * https://www.open-xchange.com/legal/. The contributing author shall be
+ * given Attribution for the derivative code and a license granting use.
+ *
+ * Copyright (C) 2016-2020 OX Software GmbH
+ * Mail: info@open-xchange.com
+ *
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the Mozilla Public License 2.0
+ * for more details.
+ */
+
+import 'package:flutter/material.dart';
+
+OutlineButton buildOutlineButton({
+  BuildContext context,
+  Function onPressed,
+  Widget child,
+  Color color,
+}) {
+  return OutlineButton(
+    highlightedBorderColor: color,
+    borderSide: BorderSide(color: color),
+    textColor: color,
+    onPressed: onPressed,
+    child: child,
+  );
+}
+
+Widget getTextOrPlaceHolder({
+  @required String text,
+  TextStyle style,
+  TextAlign align,
+  @required String placeholderText,
+  TextStyle placeholderStyle,
+  TextAlign placeHolderAlign,
+}) {
+  return text != null && text.isNotEmpty
+      ? Text(
+          text,
+          style: style,
+          textAlign: align,
+        )
+      : Text(
+          placeholderText,
+          style: placeholderStyle,
+          textAlign: placeHolderAlign,
+        );
+}
diff --git a/lib/source/widgets/avatar.dart b/lib/source/widgets/avatar.dart
new file mode 100644
index 00000000..b83d7faa
--- /dev/null
+++ b/lib/source/widgets/avatar.dart
@@ -0,0 +1,29 @@
+import 'dart:io';
+
+import 'package:flutter/material.dart';
+
+class Avatar extends StatelessWidget {
+  final String imagePath;
+  final String initials;
+  final Color color;
+
+  Avatar({this.imagePath, @required this.initials, this.color});
+
+  @override
+  Widget build(BuildContext context) {
+    FileImage avatarImage;
+    if (imagePath != null && imagePath.isNotEmpty) {
+      avatarImage = FileImage(File(imagePath));
+    }
+    return CircleAvatar(
+      radius: 24,
+      foregroundColor: Colors.white,
+      backgroundColor: color != null ? color : Colors.blue[700],
+      child: avatarImage != null ? avatarImage : showInitials(),
+    );
+  }
+
+  Text showInitials() {
+    return new Text(initials);
+  }
+}
diff --git a/lib/source/widgets/avatar_list_item.dart b/lib/source/widgets/avatar_list_item.dart
new file mode 100644
index 00000000..2934c65f
--- /dev/null
+++ b/lib/source/widgets/avatar_list_item.dart
@@ -0,0 +1,108 @@
+import 'package:flutter/material.dart';
+import 'package:ox_talk/source/widgets/avatar.dart';
+import 'package:ox_talk/source/utils/dimensions.dart';
+
+class AvatarListItem extends StatelessWidget {
+  final String title;
+  final String subTitle;
+  final String imagePath;
+  final Color color;
+  final Function onTap;
+  final Widget titleIcon;
+  final Widget subTitleIcon;
+  final IconData avatarIcon;
+
+  AvatarListItem(
+      {@required this.title, @required this.subTitle, @required this.onTap, this.avatarIcon, this.imagePath, this.color, this.titleIcon, this.subTitleIcon});
+
+  @override
+  Widget build(BuildContext context) {
+    return InkWell(
+      onTap: () => onTap(title, subTitle),
+      child: Container(
+        padding: const EdgeInsets.only(top: listItemPaddingSmall),
+        child: Row(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: <Widget>[
+            avatarIcon == null ? Avatar(
+              imagePath: imagePath,
+              initials: getInitials(),
+              color: color,
+            ) :  CircleAvatar(
+              radius: 24,
+              foregroundColor: Colors.white,
+              backgroundColor: Colors.grey,
+              child: Icon(avatarIcon),
+            ),
+            Expanded(
+              child: Padding(
+                padding: EdgeInsets.symmetric(horizontal: listItemPadding),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.stretch,
+                  children: <Widget>[
+                    Row(
+                      children: <Widget>[
+                        Padding(
+                          padding: const EdgeInsets.only(right: 4),
+                          child: titleIcon != null ? titleIcon : Container(),
+                        ),
+                        Expanded(child: getTitle()),
+                      ],
+                    ),
+                    Padding(
+                        padding: EdgeInsets.symmetric(
+                      vertical: listItemPaddingSmall,
+                    )),
+                    Row(
+                      children: <Widget>[
+                        Padding(
+                          padding: const EdgeInsets.only(right: 4),
+                          child: subTitleIcon != null ? subTitleIcon : Container(),
+                        ),
+                        Expanded(child: getSubTitle()),
+                      ],
+                    ),
+                    Divider(),
+                  ],
+                ),
+              ),
+            )
+          ],
+        ),
+      ),
+    );
+  }
+
+  StatelessWidget getTitle() {
+    return title != null
+        ? Text(
+            title,
+            maxLines: 1,
+            overflow: TextOverflow.ellipsis,
+            style: TextStyle(fontWeight: FontWeight.w500, fontSize: 18.0),
+          )
+        : Container();
+  }
+
+  StatelessWidget getSubTitle() {
+    return subTitle != null
+        ? Text(
+            subTitle,
+            maxLines: 1,
+            overflow: TextOverflow.ellipsis,
+            style: TextStyle(color: Colors.black45),
+          )
+        : Container();
+  }
+
+  String getInitials() {
+    if (title != null && title.isNotEmpty) {
+      return title.substring(0, 1);
+    }
+    if (subTitle != null && subTitle.isNotEmpty) {
+      return subTitle.substring(0, 1);
+    }
+    return "";
+  }
+
+}
diff --git a/lib/source/ui/dialog_util.dart b/lib/source/widgets/dialog_builder.dart
similarity index 99%
rename from lib/source/ui/dialog_util.dart
rename to lib/source/widgets/dialog_builder.dart
index 8585a7a1..9ee00914 100644
--- a/lib/source/ui/dialog_util.dart
+++ b/lib/source/widgets/dialog_builder.dart
@@ -42,7 +42,7 @@
 
 import 'package:flutter/material.dart';
 
-class DialogUtil {
+class DialogBuilder {
   static showConfirmationDialog(
       {@required BuildContext context,
       @required String title,
diff --git a/lib/source/ui/progress_handler.dart b/lib/source/widgets/progress_handler.dart
similarity index 94%
rename from lib/source/ui/progress_handler.dart
rename to lib/source/widgets/progress_handler.dart
index 17628f23..267ae32f 100644
--- a/lib/source/ui/progress_handler.dart
+++ b/lib/source/widgets/progress_handler.dart
@@ -44,7 +44,7 @@ import 'package:bloc/bloc.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:ox_talk/source/base/bloc_progress_state.dart';
-import 'package:ox_talk/source/ui/styles.dart';
+import 'package:ox_talk/source/utils/styles.dart';
 
 class FullscreenProgress<T extends Bloc> extends StatelessWidget {
   final String _text;
@@ -83,14 +83,14 @@ class FullscreenProgress<T extends Bloc> extends StatelessWidget {
         ),
         Padding(
           padding: EdgeInsets.only(top: 8.0),
-          child: Text(_text, style: TextStyles.progress),
+          child: Text(_text, style: progressText),
         ),
       ],
     );
     if (_showProgressValues) {
       column.children.add(Padding(
         padding: EdgeInsets.only(top: 8.0),
-        child: Text("${progress / 10}%", style: TextStyles.progress),
+        child: Text("${progress / 10}%", style: progressText),
       ));
     }
     return column;
diff --git a/lib/source/form/validatable_text_form_field.dart b/lib/source/widgets/validatable_text_form_field.dart
similarity index 87%
rename from lib/source/form/validatable_text_form_field.dart
rename to lib/source/widgets/validatable_text_form_field.dart
index cfb1a4f2..e82d1d32 100644
--- a/lib/source/form/validatable_text_form_field.dart
+++ b/lib/source/widgets/validatable_text_form_field.dart
@@ -41,6 +41,7 @@
  */
 
 import 'package:flutter/material.dart';
+import 'package:ox_talk/source/l10n/localizations.dart';
 
 enum TextFormType {
   normal,
@@ -51,16 +52,16 @@ enum TextFormType {
 
 class ValidatableTextFormField extends StatefulWidget {
   final TextFormType textFormType;
-  final String labelText;
-  final String hintText;
+  final Function labelText;
+  final Function hintText;
   final bool autoFocus;
   final TextInputType inputType;
   final TextEditingController controller = TextEditingController();
   final bool needValidation;
 
   ValidatableTextFormField(
-    this.labelText,
-    this.hintText, {
+    this.labelText, {
+    this.hintText,
     Key key,
     this.textFormType = TextFormType.normal,
     this.inputType = TextInputType.text,
@@ -89,17 +90,17 @@ class _ValidatableTextFormFieldState extends State<ValidatableTextFormField> {
         validator: (value) {
           if (widget.needValidation) {
             if (widget.textFormType == TextFormType.email && !isEmail(value)) {
-              return 'It is not a valid email!';
+              return AppLocalizations.of(context).validatableTextFormFieldHintInvalidEmail;
             } else if (widget.textFormType == TextFormType.port) {
               if (!isValidPort(value)) {
-                return 'Please enter a valid port (1-65535)';
+                return AppLocalizations.of(context).validatableTextFormFieldHintInvalidPort;
               }
             }
           }
         },
         decoration: InputDecoration(
-          labelText: widget.labelText,
-          hintText: widget.hintText,
+          labelText: widget.labelText(context),
+          hintText: widget.hintText != null ? widget.hintText(context) : "",
         ));
   }
 
@@ -112,13 +113,13 @@ class _ValidatableTextFormFieldState extends State<ValidatableTextFormField> {
         validator: (value) {
           if (widget.needValidation) {
             if (value.isEmpty) {
-              return 'Please enter your password!';
+              return AppLocalizations.of(context).validatableTextFormFieldHintInvalidPassword;
             }
           }
         },
         decoration: InputDecoration(
-          labelText: widget.labelText,
-          hintText: widget.hintText,
+          labelText: widget.labelText(context),
+          hintText: widget.hintText != null ? widget.hintText(context) : "",
           suffixIcon: IconButton(icon: Icon(!_passwordIsVisible ? Icons.visibility_off : Icons.visibility), onPressed: _togglePasswordVisibility),
         ));
   }
diff --git a/pubspec.yaml b/pubspec.yaml
index c1395efe..9bbdc851 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,13 +1,7 @@
 name: ox_talk
 description: OX Talk is a mail based chat app.
 
-# The following defines the version and build number for your application.
-# A version number is three numbers separated by dots, like 1.2.43
-# followed by an optional build number separated by a +.
-# Both the version and the builder number may be overridden in flutter
-# build by specifying --build-name and --build-number, respectively.
-# Read more about versioning at semver.org.
-version: 0.0.4+397
+version: 0.1.0+398 # x.y.z+build-number
 
 environment:
   sdk: ">=2.0.0-dev.68.0 <3.0.0"
@@ -18,63 +12,24 @@ dependencies:
   flutter_localizations:
     sdk: flutter
   bloc: ^0.8.0
-  contacts_service: ^0.1.0
-  cupertino_icons: ^0.1.2 # Use with the CupertinoIcons class for iOS style icons.
+  contacts_service: ^0.2.0
+  cupertino_icons: ^0.1.2
   date_format: ^1.0.5
   flutter_bloc: ^0.5.1
-  fluttertoast: ^2.2.9
+  fluttertoast: ^3.0.0
   rxdart: ^0.20.0
-  image_picker_ui: ^0.1.2
+  #image_picker_ui: ^0.2.0
+  open_file: ^1.2.2+2
   path_provider: ^0.4.1
-  shared_preferences: ^0.5.0
-  simple_permissions: ^0.1.9
+  permission_handler: ^3.0.0
+  shared_preferences: ^0.5.1+1
   delta_chat_core:
-    path: ../delta_chat_core/ # Intended path outside the project context
+    path: ../flutter-deltachat-core/ # Intended path outside the project context
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
-
   intl_translation: ^0.17.1
 
-# For information on the generic Dart part of this file, see the
-# following page: https://www.dartlang.org/tools/pub/pubspec
-
-# The following section is specific to Flutter.
 flutter:
-
-  # The following line ensures that the Material Icons font is
-  # included with your application, so that you can use the icons in
-  # the material Icons class.
-  uses-material-design: true
-
-  # To add assets to your application, add an assets section, like this:
-  # assets:
-  #  - images/a_dot_burr.jpeg
-  #  - images/a_dot_ham.jpeg
-
-  # An image asset can refer to one or more resolution-specific "variants", see
-  # https://flutter.io/assets-and-images/#resolution-aware.
-
-  # For details regarding adding assets from package dependencies, see
-  # https://flutter.io/assets-and-images/#from-packages
-
-  # To add custom fonts to your application, add a fonts section here,
-  # in this "flutter" section. Each entry in this list should have a
-  # "family" key with the font family name, and a "fonts" key with a
-  # list giving the asset and other descriptors for the font. For
-  # example:
-  # fonts:
-  #   - family: Schyler
-  #     fonts:
-  #       - asset: fonts/Schyler-Regular.ttf
-  #       - asset: fonts/Schyler-Italic.ttf
-  #         style: italic
-  #   - family: Trajan Pro
-  #     fonts:
-  #       - asset: fonts/TrajanPro.ttf
-  #       - asset: fonts/TrajanPro_Bold.ttf
-  #         weight: 700
-  #
-  # For details regarding fonts from package dependencies,
-  # see https://flutter.io/custom-fonts/#from-packages
+  uses-material-design: true
\ No newline at end of file