diff --git a/client/src/components/ConversationListItem.js b/client/src/components/ConversationListItem.js
index a0295d5..80a3aae 100644
--- a/client/src/components/ConversationListItem.js
+++ b/client/src/components/ConversationListItem.js
@@ -18,11 +18,9 @@
                 button
                 alignItems="flex-start"
                 selected={isSelected}
-                style={{overflow:'hidden'}}
                 onClick={() => history.replace(`/account/${conversation.getAccountId()}/${uri}`)}>
                 <ListItemAvatar><ConversationAvatar displayName={conversation.getDisplayNameNoFallback()} /></ListItemAvatar>
                 <ListItemText
-                    style={{overflow:'hidden', textOverflow:'ellipsis'}}
                     primary={conversation.getDisplayName()} secondary={conversation.getDisplayUri()} />
             </ListItem>
         )
diff --git a/client/src/components/MessageList.js b/client/src/components/MessageList.js
index e73af6a..175f19b 100644
--- a/client/src/components/MessageList.js
+++ b/client/src/components/MessageList.js
@@ -15,12 +15,12 @@
   return (
     <React.Fragment>
       <Box className="conversation-header">
-        <Box style={{ display: 'inline-block', margin: 16, verticalAlign: 'middle' }}>
+        <Box style={{ margin: 16, flexShrink: 0 }}>
           <ConversationAvatar displayName={props.conversation.getDisplayNameNoFallback()} />
         </Box>
-        <Box style={{ display: 'inline-block', verticalAlign: 'middle' }}>
-          <Typography variant="h6">{displayName}</Typography>
-          <Typography variant="subtitle1">{props.conversation.getId()}</Typography>
+        <Box style={{ flex: "1 1 auto", overflow: 'hidden' }}>
+          <Typography className="title" variant="h6">{displayName}</Typography>
+          <Typography className="subtitle" variant="subtitle1" >{props.conversation.getId()}</Typography>
         </Box>
         <Divider orientation="horizontal" />
       </Box>
diff --git a/client/src/index.scss b/client/src/index.scss
index 05a3129..7c2adbe 100644
--- a/client/src/index.scss
+++ b/client/src/index.scss
@@ -36,10 +36,19 @@
   grid-area: m;
   display: flex;
   flex-direction: column;
+  overflow: hidden;
 }
 
 .conversation-header {
   grid-area: h;
+  display: flex;
+  align-items: center;
+  padding-right: 8px;
+
+  .title, .subtitle {
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
 }
 
 .send-message-form {
diff --git a/client/src/pages/jamiAccountCreation.jsx b/client/src/pages/jamiAccountCreation.jsx
index 2bd8ea9..ac59762 100644
--- a/client/src/pages/jamiAccountCreation.jsx
+++ b/client/src/pages/jamiAccountCreation.jsx
@@ -40,9 +40,7 @@
         'Accept': 'application/json',
         'Content-Type': 'application/json'
       },
-      body: JSON.stringify({
-        'Account.registeredName': name
-      })
+      body: JSON.stringify({ registerName: name })
     })
       .then(res => res.json())
       .catch(error => {