diff --git a/Application/Clavardage/src/controller/Controller.java b/Application/Clavardage/src/controller/Controller.java
index f04f1fe..dbd313c 100644
--- a/Application/Clavardage/src/controller/Controller.java
+++ b/Application/Clavardage/src/controller/Controller.java
@@ -357,13 +357,11 @@ public class Controller {
 		String message = (String) msg.getMessage(); // TODO check if instance of Msg_Text or anything else and threat it given a type
 		
 		// Date l'envoie du message
-		String dateString;
-		Date date;
-	    Calendar date1=Calendar.getInstance();
-	    date = new Date();
-	    date1.setTime(date);
-		dateString=date1.toString();		
-		//this.getHistory().saveMessage(getMyUser(), c.getRemoteUser(),message ,dateString );
+		DateFormat dateFormat = new SimpleDateFormat("yyyy MM dd HH mm ss");
+
+		Date date=new Date();
+	   	
+		//this.getHistory().saveMessage(getMyUser(), c.getRemoteUser(),message ,dateFormat.format(date) );
 		
 		/*
 		System.out.println(this.getHistory());
@@ -378,8 +376,7 @@ public class Controller {
 	    //this.getHistory().saveMessage(this.myUser, c.getRemoteUser(),message ,dateString);
 	    
 	    // Envoie du message (avec la date) 
-		DateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
-		out.println(dateString);
+		out.println(dateFormat.format(date));
 		out.println(message);
 	}