--- a/coffee/messages.coffee	Fri Dec 09 13:23:03 2016 +0800
+++ b/coffee/messages.coffee	Mon Dec 12 18:00:04 2016 +0800
@@ -75,7 +75,7 @@
     @model.get('contact')?.get('d/handle') or @model.get('from')
 
   render: (model) ->
-    @rivet = rivets.bind(@el, model: @model, view: @)
+    @rivet = rivets.bind(@el, message: @model, view: @)
     contact = @model.get('contact')
     if contact
       @av = new Tram.AvatarView(model: contact)

--- a/index.html	Fri Dec 09 13:23:03 2016 +0800
+++ b/index.html	Mon Dec 12 18:00:04 2016 +0800
@@ -244,25 +244,25 @@
       </div>
     </script>
     <script type="text/template" id="message-template">
-      <div class="message" rv-data-id="model:id">
-        <div class="splitter" rv-if="model:d/split"></div>
-        <div class="column avatar-column" rv-class-uk-invisible="model:d/fold"></div>
+      <div class="message" rv-data-id="message:id">
+        <div class="splitter" rv-if="message:d/split"></div>
+        <div class="column avatar-column" rv-class-uk-invisible="message:d/fold"></div>
         <div class="column text-column">
-          <div rv-hide="model:d/fold">
-            <strong>{ view.getHandle < model:contact:d/handle model:from }</strong>
+          <div rv-hide="message:d/fold">
+            <strong>{ view.getHandle < message:contact:d/handle message:from }</strong>
           </div>
-          <div rv-class="model:cls">
+          <div rv-class="message:cls">
             <span class="uk-float-right uk-text-muted">
-              <i class="uk-icon-pencil" rv-if="model:corrected" title="Edited (XEP-0308)"></i>
-              <i class="uk-icon-files-o" rv-if="model:carbon" title="Carbon (XEP-0280)"></i>
+              <i class="uk-icon-pencil" rv-if="message:corrected" title="Edited (XEP-0308)"></i>
+              <i class="uk-icon-files-o" rv-if="message:carbon" title="Carbon (XEP-0280)"></i>
               <time class="stamp"
-                    rv-datetime="model:d/mstamp | iso-date"
-                    rv-title="model:d/mstamp | format-date 'HH:mm:ss'">
-                { model:d/mstamp | from-now }
+                    rv-datetime="message:d/mstamp | iso-date"
+                    rv-title="message:d/mstamp | format-date 'HH:mm:ss'">
+                { message:d/mstamp | from-now }
               </time>
             </span>
-            <div rv-unless="model:html">{ model:text }</div>
-            <div class="xhtml-body" rv-if="model:html" rv-html="model:html"></div>
+            <div rv-unless="message:html">{ message:text }</div>
+            <div class="xhtml-body" rv-if="message:html" rv-html="message:html"></div>
           </div>
         </div>
       </div>

--- a/js/messages.js	Fri Dec 09 13:23:03 2016 +0800
+++ b/js/messages.js	Mon Dec 12 18:00:04 2016 +0800
@@ -125,7 +125,7 @@
     MessageView.prototype.render = function(model) {
       var contact;
       this.rivet = rivets.bind(this.el, {
-        model: this.model,
+        message: this.model,
         view: this
       });
       contact = this.model.get('contact');

--- a/js/messages.js.map	Fri Dec 09 13:23:03 2016 +0800
+++ b/js/messages.js.map	Mon Dec 12 18:00:04 2016 +0800
@@ -6,5 +6,5 @@
     "coffee/messages.coffee"
   ],
   "names": [],
-  "mappings": "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"
+  "mappings": "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"
 }
\ No newline at end of file