5 files changed, 35 insertions, 73 deletions
diff --git a/Swift/resources/themes/Default/Outgoing/Content.html b/Swift/resources/themes/Default/Outgoing/Content.html
index 87ca272..e73e785 100755..100644
--- a/Swift/resources/themes/Default/Outgoing/Content.html
+++ b/Swift/resources/themes/Default/Outgoing/Content.html
@@ -1,30 +1,19 @@
-<div class="chatItem outgoingItem">
-	<table width="100%">
-		<tr>
-			<td valign="top">
-				<img src="%userIconPath%" class="avatar" title="%sender%" />
-				<div class="myBubble">
-					<div class="indicator"></div>
-					<table class="tableBubble" cellspacing="0" cellpadding="0">
-						<tr>
-							<td class="tl"></td>
-							<td class="tr"></td>
-						</tr>
-						<tr>
-							<td class="message" style="direction: %direction%">
-								%message%
-								<div class="timeStamp"><span class="name">%wrapped_sender% @</span> %time%</div>
-								<span id="insert"></span>
-							</td>
-							<td class="messageRight"></td>
-						</tr>
-						<tr>
-							<td class="bl"></td>
-							<td class="br"></td>
-						</tr>
-					</table>
-				</div>
-			</td>
-		</tr>
-	</table>
+<!--MY MESSAGE-->
+<div class="message" id="%id%">
+    <div class="user">
+        <div class="myavatar">
+            <img src="%userIconPath%"/>
+        </div>
+        <div class="myright">
+            <span class="swift_ack"></span>
+            <span class="swift_receipt"></span>
+        </div>
+    </div>
+    <div class="text">
+        <p class="myusername username">%wrapped_sender%</p>
+        <div class="time">
+            %time%
+        </div>
+        <div class="message-content">%message%</div>
+    </div>
 </div>
diff --git a/Swift/resources/themes/Default/Outgoing/Context.html b/Swift/resources/themes/Default/Outgoing/Context.html
deleted file mode 100755
index 229c592..0000000
--- a/Swift/resources/themes/Default/Outgoing/Context.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<div class="chatItem outgoingItem">
-	<table width="100%">
-		<tr>
-			<td valign="top">
-				<img src="%userIconPath%" class="avatar"/>
-				<div class="myBubble">
-					<div class="indicator"></div>
-					<table class="tableBubble" cellspacing="0" cellpadding="0">
-						<tr>
-							<td class="tl"></td>
-							<td class="tr"></td>
-						</tr>
-						<tr>
-							<td class="message" style="direction: %direction%">
-								
-								%message%
-								<div class="timeStamp"><span class="name">%sender% @</span> %time%</div>
-								<span id="insert"></span>
-							</td>
-							<td class="messageRight"></td>
-						</tr>
-						<tr>
-							<td class="bl"></td>
-							<td class="br"></td>
-						</tr>
-					</table>
-				</div>
-			</td>
-		</tr>
-	</table>
-</div>
diff --git a/Swift/resources/themes/Default/Outgoing/NextContent.html b/Swift/resources/themes/Default/Outgoing/NextContent.html
index fe6490e..f96f65a 100755..100644
--- a/Swift/resources/themes/Default/Outgoing/NextContent.html
+++ b/Swift/resources/themes/Default/Outgoing/NextContent.html
@@ -1,9 +1,19 @@
-<div>
-	<div class="followUp"></div>
-	<div style="direction: %direction%">
-		%message%
-		<div class="timeStamp">%time%</div>
-	</div>
-	<span id="insert"></span>
+<!--My MESSAGE ADDITIONAL-->
+<div class="message additional" id="%id%">
+    <div class="user">
+        <div class="systemavatar">
+            <img/>
+        </div>
+        <div class="systemright">
+            <span class="swift_ack"></span>
+            <span class="swift_receipt"></span>
+        </div>
+    </div>
+    <div class="text">
+        <div class="time">
+            %time%
+        </div>
+        <div class="message-content">%message%</div>
+    </div>
 </div>
 
diff --git a/Swift/resources/themes/Default/Outgoing/NextContext.html b/Swift/resources/themes/Default/Outgoing/NextContext.html
deleted file mode 100755
index f66aeeb..0000000
--- a/Swift/resources/themes/Default/Outgoing/NextContext.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="followUp"></div>
-<div style="direction: %direction%">
-	%message%
-	<div class="timeStamp">%time%</div>
-</div><span id="insert"></span>
-
diff --git a/Swift/resources/themes/Default/Outgoing/buddy_icon.png b/Swift/resources/themes/Default/Outgoing/buddy_icon.png
deleted file mode 100644
index 1d9f5f3..0000000
--- a/Swift/resources/themes/Default/Outgoing/buddy_icon.png
+++ /dev/null