diff --git a/src/skins/vector/css/molecules/MessageComposer.css b/src/skins/vector/css/molecules/MessageComposer.css
index fbbeef6455..3fb38c317f 100644
--- a/src/skins/vector/css/molecules/MessageComposer.css
+++ b/src/skins/vector/css/molecules/MessageComposer.css
@@ -72,7 +72,8 @@ limitations under the License.
}
.mx_MessageComposer_upload,
-.mx_MessageComposer_call {
+.mx_MessageComposer_voicecall,
+.mx_MessageComposer_videocall {
display: table-cell;
vertical-align: middle;
padding-left: 10px;
@@ -80,7 +81,12 @@ limitations under the License.
cursor: pointer;
}
-.mx_MessageComposer_call {
+.mx_MessageComposer_videocall {
+ padding-right: 10px;
+ padding-top: 4px;
+}
+
+.mx_MessageComposer_voicecall {
padding-right: 10px;
padding-top: 4px;
}
diff --git a/src/skins/vector/views/molecules/MessageComposer.js b/src/skins/vector/views/molecules/MessageComposer.js
index 51f3a1150e..501e2464ac 100644
--- a/src/skins/vector/views/molecules/MessageComposer.js
+++ b/src/skins/vector/views/molecules/MessageComposer.js
@@ -53,6 +53,14 @@ module.exports = React.createClass({
});
},
+ onVoiceCallClick: function(ev) {
+ dis.dispatch({
+ action: 'place_call',
+ type: 'voice',
+ room_id: this.props.room.roomId
+ });
+ },
+
render: function() {
var me = this.props.room.getMember(MatrixClientPeg.get().credentials.userId);
var uploadInputStyle = {display: 'none'};
@@ -71,7 +79,10 @@ module.exports = React.createClass({
-