diff --git a/app/routes/ApiRtes.js b/app/routes/ApiRtes.js
index 1c9c6a9..f11fc37 100644
--- a/app/routes/ApiRtes.js
+++ b/app/routes/ApiRtes.js
@@ -91,12 +91,13 @@ sessionData = function (session, cb) {
             // Permissions
             session.canAddMembre = session.bureau;
             session.canDelMembre = session.bureau;
+            session.canAddDoss = session.bureau;
+            session.canDelDoss = session.bureau;
             session.canAddConv = true;
             session.canDelConv = session.bureau;
             session.canAddMess = true;
+            session.canEditMess = false;
             session.canDelMess = session.bureau;
-            session.canAddDoss = session.bureau;
-            session.canDelDoss = session.bureau;
             cb(session);
         });
     });
diff --git a/public/css/style.css b/public/css/style.css
index fa4dfda..81ade12 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -36,6 +36,16 @@ body {
     animation: zoomOut 0.5s;
 }
 
+[mess-edit] .ng-enter {
+    -webkit-animation: flipInY 0.5s;
+    animation: flipInY 0.5s;
+}
+
+[mess-edit] .ng-leave {
+    -webkit-animation: flipOutY 0.5s;
+    animation: flipOutY 0.5s;
+}
+
 body > .container {
     position: relative;
 }
diff --git a/public/js/controllers/ForumConvCtrl.js b/public/js/controllers/ForumConvCtrl.js
index 760a89a..a64beee 100644
--- a/public/js/controllers/ForumConvCtrl.js
+++ b/public/js/controllers/ForumConvCtrl.js
@@ -1,4 +1,4 @@
-angular.module('ForumConvCtrl', ['SessionsServ', 'ApiServ', 'ngSanitize', 'btford.markdown'])
+angular.module('ForumConvCtrl', ['SessionsServ', 'ApiServ', 'MessEditDrct'])
     .controller('ForumConvCtrl', function ($scope, $routeParams, SessionServ, ApiServ) {
         $scope.messs = [];
         $scope.conv = {};
@@ -20,8 +20,10 @@ angular.module('ForumConvCtrl', ['SessionsServ', 'ApiServ', 'ngSanitize', 'btfor
         });
 
         $scope.addMess = function () {
-            data = $scope.formData;
-            data.conv = $scope.conv._id;
+            data = {
+                content: $scope.mess.content,
+                conv: $scope.conv._id
+            };
             ApiServ("envoi du message", 'post', 'messs', data, function (err, mess) {
                 if (!err) {
                     $scope.formData = {};
@@ -37,4 +39,15 @@ angular.module('ForumConvCtrl', ['SessionsServ', 'ApiServ', 'ngSanitize', 'btfor
             });
         };
 
+        $scope.editButton = function (index) {
+            mess = $scope.messs[index];
+            if (mess.editMode) {
+                mess.viewSource = false;
+                console.log('Submit edition');
+            } else {
+                mess.viewSource = true;
+            }
+            mess.editMode = !mess.editMode;
+        };
+
     });
diff --git a/public/js/directives/MessEditDrct.js b/public/js/directives/MessEditDrct.js
new file mode 100644
index 0000000..0ce32b8
--- /dev/null
+++ b/public/js/directives/MessEditDrct.js
@@ -0,0 +1,11 @@
+angular.module('MessEditDrct', ['ngSanitize', 'btford.markdown'])
+    .directive('messEdit', function () {
+        return {
+            templateUrl: 'views/messEdit.html'
+        };
+    })
+    .directive('messViewsource', function () {
+        return {
+            templateUrl: 'views/messViewsource.html'
+        };
+    });
diff --git a/public/views/forumConv.html b/public/views/forumConv.html
index 32d6d62..800df98 100644
--- a/public/views/forumConv.html
+++ b/public/views/forumConv.html
@@ -24,24 +24,28 @@
                     <br/> {{ mess.auteur.role }}
                     <br/> {{ doss.date }}
                 </td>
-                <td btf-markdown="mess.content">
-                </td>
+                <!-- <td btf-markdown="mess.content"></td> -->
+                <td mess-edit></td>
                 <td>
+                    <mess-viewsource></mess-viewsource>
+                    <button type="button" class="btn btn-primary" ng-show="session.canEditMess" ng-click="editButton($index)">
+                        <span class="glyphicon glyphicon-edit" aria-hidden="true" ng-hide="mess.editMode"></span>
+                        <span class="glyphicon glyphicon-ok" aria-hidden="true" ng-show="mess.editMode"></span>
+                    </button>
                     <button type="button" class="btn btn-danger" ng-show="session.canDelMess" ng-click="delMess($index)">
                         <span class="glyphicon glyphicon-remove" aria-hidden="true"></span>
                     </button>
                 </td>
             </tr>
             <tr ng-show="session.canAddMess">
-                <form>
+                <form ng-init="mess = {content: '', editMode: true, viewSource: true}">
                     <td>
                         <label for="nvMessTitre">Nouveau message</label>
                     </td>
-                    <td class="form-group">
-                        <textarea class="form-control" id="nvMessTitre" rows="7" placeholder="Contenu du message" ng-model="formData.content"></textarea>
-                    </td>
+                    <td mess-edit></td>
                     <td>
-                        <button type="submit" class="btn btn-primary" ng-class="{disabled: !formData.content}" ng-click="addMess()">
+                        <mess-viewsource></mess-viewsource>
+                        <button type="submit" class="btn btn-primary" ng-class="{disabled: !mess.content}" ng-click="addMess()">
                             <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
                         </button>
                     </td>
diff --git a/public/views/index.html b/public/views/index.html
index d39cfb5..d9b2ddc 100644
--- a/public/views/index.html
+++ b/public/views/index.html
@@ -27,6 +27,7 @@
     <script src="js/services/ApiServ.js"></script>
     <script src="js/services/EncryptServ.js"></script>
     <script src="js/services/SessionServ.js"></script>
+    <script src="js/directives/MessEditDrct.js"></script>
     <script src="js/controllers/SessionCtrl.js"></script>
     <script src="js/controllers/ConnectCtrl.js"></script>
     <script src="js/controllers/MembreCtrl.js"></script>
diff --git a/public/views/messEdit.html b/public/views/messEdit.html
new file mode 100644
index 0000000..4d117b5
--- /dev/null
+++ b/public/views/messEdit.html
@@ -0,0 +1,3 @@
+<div btf-markdown="mess.content" ng-show="!mess.viewSource"></div>
+<code ng-show="mess.viewSource && !mess.editMode">{{ mess.content }}</code>
+<textarea class="form-control" id="nvMessTitre" rows="7" placeholder="Contenu du message" ng-model="mess.content" ng-show="mess.viewSource && mess.editMode"></textarea>
\ No newline at end of file
diff --git a/public/views/messViewsource.html b/public/views/messViewsource.html
new file mode 100644
index 0000000..04b2461
--- /dev/null
+++ b/public/views/messViewsource.html
@@ -0,0 +1,4 @@
+<button type="button" class="btn btn-default" ng-click="mess.viewSource = !mess.viewSource">
+    <span class="glyphicon glyphicon-console" aria-hidden="true" ng-hide="mess.viewSource"></span>
+    <span class="glyphicon glyphicon-file" aria-hidden="true" ng-show="mess.viewSource"></span>
+</button>
\ No newline at end of file
--
libgit2 0.21.2