5 files changed, 33 insertions, 75 deletions
diff --git a/Swift/resources/themes/Default/Incoming/Content.html b/Swift/resources/themes/Default/Incoming/Content.html
index dc5f8b2..05c9796 100755..100644
--- a/Swift/resources/themes/Default/Incoming/Content.html
+++ b/Swift/resources/themes/Default/Incoming/Content.html
@@ -1,30 +1,18 @@
-<div class="chatItem incomingItem">
-	<table width="100%">
-		<tr>
-			<td valign="top">
-				<img src="%userIconPath%" class="avatar" title="%sender%" ondragstart="return false" />
-				<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>
+<!--OTHERS MESSAGE-->
+<div class="message" id="%id%">
+    <div class="user">
+        <div class="time">
+            <p>%time%</p>
+            <span class="swift_ack"></span>
+            <span class="swift_receipt"></span>
+        </div>
+        <div class="otheravatar">
+            <img src="%userIconPath%"/>
+        </div>
+        <div class="otherright"></div>
+    </div>
+    <div class="text">
+        <p class="otherusername">%wrapped_sender%</p>
+        <div class="message-content">%message%</div>
+    </div>
 </div>
diff --git a/Swift/resources/themes/Default/Incoming/Context.html b/Swift/resources/themes/Default/Incoming/Context.html
deleted file mode 100755
index 1f0c528..0000000
--- a/Swift/resources/themes/Default/Incoming/Context.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<div class="chatItem incomingItem">
-	<table width="100%">
-		<tr>
-			<td valign="top">
-				<img src="%userIconPath%" class="avatar" ondragstart="return false" />
-				<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/Incoming/NextContent.html b/Swift/resources/themes/Default/Incoming/NextContent.html
index aff669b..af5ec2b 100755..100644
--- a/Swift/resources/themes/Default/Incoming/NextContent.html
+++ b/Swift/resources/themes/Default/Incoming/NextContent.html
@@ -1,10 +1,17 @@
-<div>
-	<div class="followUp"></div>
-	<div style="direction: %direction%">
-		
-		%message%
-		<div class="timeStamp">%time%</div>
-	</div>
-	<span id="insert"></span>
+<!--OTHERS MESSAGE ADDITIONAL-->
+<div class="message additional" id="%id%">
+    <div class="user">
+        <div class="time-additional">
+            <p>%time%</p>
+            <span class="swift_ack"></span>
+            <span class="swift_receipt"></span>
+        </div>
+        <div class="systemavatar">
+            <img/>
+        </div>
+        <div class="systemright"></div>
+    </div>
+    <div class="text">
+        <div class="message-content">%message%</div>
+    </div>
 </div>
-
diff --git a/Swift/resources/themes/Default/Incoming/NextContext.html b/Swift/resources/themes/Default/Incoming/NextContext.html
deleted file mode 100755
index c0a8846..0000000
--- a/Swift/resources/themes/Default/Incoming/NextContext.html
+++ /dev/null
@@ -1,7 +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/Incoming/buddy_icon.png b/Swift/resources/themes/Default/Incoming/buddy_icon.png
deleted file mode 100644
index 0757aaa..0000000
--- a/Swift/resources/themes/Default/Incoming/buddy_icon.png
+++ /dev/null