diff --git a/client/src/components/ContactList.js b/client/src/components/ContactList.js
index af232a0..50b773d 100644
--- a/client/src/components/ContactList.js
+++ b/client/src/components/ContactList.js
@@ -1,14 +1,12 @@
+import List from '@material-ui/core/List'
 import React from 'react'
 
 class ContactList extends React.Component {
     render() {
-
         return (
-            <div className="rooms-list">
-                <ul>
-                    <h3>Liste de contacts</h3>
-                </ul>
-            </div>
+            <List>
+
+            </List>
         )
     }
 }
diff --git a/client/src/components/ConversationList.js b/client/src/components/ConversationList.js
new file mode 100644
index 0000000..4620d77
--- /dev/null
+++ b/client/src/components/ConversationList.js
@@ -0,0 +1,18 @@
+import List from '@material-ui/core/List'
+import React from 'react'
+import ConversationListItem from './ConversationListItem'
+
+class ConversationList extends React.Component {
+    render() {
+
+        return (
+            <List>
+                {this.props.conversations.forEach(conversation => {
+                    <ConversationListItem conversation={conversation} />
+                })}
+            </List>
+        )
+    }
+}
+
+export default ConversationList
\ No newline at end of file
diff --git a/client/src/components/ConversationListItem.js b/client/src/components/ConversationListItem.js
new file mode 100644
index 0000000..3a271fc
--- /dev/null
+++ b/client/src/components/ConversationListItem.js
@@ -0,0 +1,16 @@
+import { Avatar, ListItem, ListItemAvatar, ListItemText } from '@material-ui/core'
+import React from 'react'
+
+class ConversationListItem extends React.Component {
+    render() {
+
+        return (
+            <ListItem alignItems="flex-start">
+                <ListItemAvatar><Avatar>{this.props.conversation.getDisplayName()[0]}</Avatar></ListItemAvatar>
+                <ListItemText primary={this.props.conversation.getDisplayName()} />
+            </ListItem>
+        )
+    }
+}
+
+export default ConversationListItem
\ No newline at end of file
diff --git a/client/src/components/SendMessageForm.js b/client/src/components/SendMessageForm.js
index 43a4998..fd648e5 100644
--- a/client/src/components/SendMessageForm.js
+++ b/client/src/components/SendMessageForm.js
@@ -37,8 +37,8 @@
                     disabled={this.props.disabled}
                     onChange={this.handleChange}
                     value={this.state.message}
-                    cleanOnEnter
-                    onEnter={this.handleSubmit}
+                    //cleanOnEnter
+                    //onEnter={this.handleSubmit}
                     placeholder="Écris ton message et cliques sur Entrer"
                     height="35"
                 />