8 files changed, 950 insertions, 35 deletions
diff --git a/static/css/header.css b/static/css/header.css
index 102897b..bd96a95 100755
--- a/static/css/header.css
+++ b/static/css/header.css
@@ -1,3 +1,4 @@
+
 .share-buttons{
 cursor:pointer;
 width:100;
@@ -69,6 +70,9 @@ font-weight:bold;
 	letter-spacing:.2px;
 	z-index: 999;
 }
+#registerlink{
+	margin-top:4px;
+}
 #bar7 img{
 margin-top:4;
   vertical-align: top;
@@ -95,7 +99,6 @@ background-image:url(/static/img/upload.png);
 	margin-right: 5px;
 	float:right;
 	z-index: 9999999999999999;
-
 	font-family: Arial, Helvetica, sans-serif;
 	font-weight: normal;
 }
@@ -344,4 +347,4 @@ a.youtube {
   left: 0;
   bottom: 0;
   margin: 0;
-}
-\ No newline at end of file
+}
diff --git a/static/css/pages.css b/static/css/pages.css
index c49e6c4..c16d34c 100644
--- a/static/css/pages.css
+++ b/static/css/pages.css
@@ -6,7 +6,7 @@ top:150;
 #byfurie{
 position:absolute;
 z-index:888888;
-left:270;top:345;
+left:290;top:353;
 }
 #chatrap{
   width:610;
diff --git a/static/img/wedontgetit.jpg b/static/img/wedontgetit.jpg
new file mode 100644
index 0000000..e8bd2c3
--- /dev/null
+++ b/static/img/wedontgetit.jpg
diff --git a/static/tests/lolmail.txt b/static/tests/lolmail.txt
new file mode 100644
index 0000000..80eff2e
--- /dev/null
+++ b/static/tests/lolmail.txt
@@ -0,0 +1,754 @@
+Dear Agent,
+
+ 
+
+I am the Compliance Officer and authorized representative of iStockphoto LP, contacting you regarding the unauthorized use of iStockphoto content on: dump.fm
+
+ 
+
+The unauthorized use can be viewed at the following locations:
+
+ 
+
+http://dump.fm/images/1266097108677-notgoingtohappen.jpg
+
+ 
+
+http://dump.fm/images/1266255579876-dontgetit.png
+
+ 
+
+http://dump.fm/images/20100312/1268412932681-dumpfm-andrej-this-guy-knows.gif
+
+ 
+
+http://dump.fm/images/20100418/1271584646128-dumpfm-whatevz-ist2_276319-corporate-your-message-here.jpg
+
+ 
+
+http://dump.fm/images/20100329/1269836545708-dumpfm-ryder-usdancing.gif
+
+ 
+
+http://dump.fm/images/20100329/1269836638081-dumpfm-ryder-dudedancing.gif
+
+ 
+
+http://dump.fm/images/20100330/1269924366027-dumpfm-frankhats-bedunno.jpg
+
+ 
+
+http://dump.fm/images/20100330/1269930997328-dumpfm-ryder-Picture-41.png
+
+ 
+
+http://dump.fm/images/20100331/1270082757023-dumpfm-jeanette-Picture-3.png
+
+ 
+
+http://dump.fm/images/20100401/1270100522426-dumpfm-ryder-Picture-90.png
+
+ 
+
+http://dump.fm/images/20100401/1270179079682-dumpfm-ryder-Picture-114.png
+
+ 
+
+http://dump.fm/images/20100401/1270179478809-dumpfm-ryder-wolfguy.gif
+
+ 
+
+http://dump.fm/images/20100402/1270195156779-dumpfm-frankhats-dunliq.jpg
+
+ 
+
+http://dump.fm/images/20100402/1270196318946-dumpfm-illalli-hothat.jpg
+
+ 
+
+http://dump.fm/images/20100401/1270151653306-dumpfm-ryder-Picture-108.png
+
+ 
+
+http://dump.fm/images/20100404/1270371704503-dumpfm-frankhats-crudun.gif
+
+ 
+
+http://dump.fm/images/20100404/1270436206347-dumpfm-frankhats-dungetilitter.gif
+
+ 
+
+http://dump.fm/images/20100405/1270449719939-dumpfm-illalli-likemike.jpg
+
+ 
+
+http://dump.fm/images/20100405/1270451213193-dumpfm-ryder-Picture-187.png
+
+ 
+
+http://dump.fm/images/20100405/1270453310699-dumpfm-ryder-yruignoring.gif
+
+ 
+
+http://dump.fm/images/20100405/1270454430952-dumpfm-frankhats-dundora.jpg
+
+ 
+
+http://25.media.tumblr.com/tumblr_l0i142Xdui1qzg8xzo1_500.gif
+
+ 
+
+http://dump.fm/images/20100407/1270677806850-dumpfm-frankhats-gildedgetit.jpg
+
+ 
+
+http://dump.fm/images/20100415/1271321993419-dumpfm-ryder-Picture-452.png
+
+ 
+
+http://dump.fm/images/20100407/1270697865705-dumpfm-ryder-artpwnd.gif
+
+ 
+
+http://dump.fm/images/20100407/1270698050400-dumpfm-ryder-dumpfmfresh.gif
+
+ 
+
+http://dump.fm/images/20100413/1271195512043-dumpfm-noisia-dontgetarm.jpg
+
+ 
+
+http://dump.fm/images/20100408/1270705138983-dumpfm-ryder-Picture-247.png
+
+ 
+
+http://dump.fm/images/20100408/1270758039197-dumpfm-ryder-Picture-254.png
+
+ 
+
+http://dump.fm/images/20100408/1270764920229-dumpfm-ryder-Picture-260.png
+
+ 
+
+http://dump.fm/images/20100409/1270801759113-dumpfm-jertronic-nogetit.png
+
+ 
+
+http://dump.fm/images/20100328/1269805908876-dumpfm-ryder-dumplift.gif
+
+ 
+
+http://dump.fm/images/20100319/1268991384841-dumpfm-jeanette-Picture-540.png
+
+ 
+
+http://dump.fm/images/20100410/1270872008733-dumpfm-frankhats-Picture-14.png
+
+ 
+
+http://dump.fm/images/20100410/1270872200318-dumpfm-frankhats-dontcatit.jpg
+
+ 
+
+http://dump.fm/images/20100410/1270873042199-dumpfm-frankhats-catrip.gif
+
+ 
+
+http://dump.fm/images/20100410/1270953524877-dumpfm-timb-idgi.cat.gif
+
+ 
+
+http://dump.fm/images/20100410/1270953524877-dumpfm-timb-idgi.cat.gif
+
+ 
+
+http://dump.fm/images/20100411/1270962214585-dumpfm-ryder-joindumpfm.png
+
+ 
+
+http://dump.fm/images/20100408/1270708774547-dumpfm-jertronic-idontevengetyou.gif
+
+ 
+
+http://dump.fm/images/1267264103873-dontgetit.gif
+
+ 
+
+http://dump.fm/images/1266377745509-popeandguy.gif
+
+ 
+
+http://dump.fm/images/1266214389930-stilldontgetit.png
+
+ 
+
+http://i46.tinypic.com/148n2b5.jpg
+
+ 
+
+http://dump.fm/images/20100412/1271118251387-dumpfm-ryder-Picture-381.png
+
+ 
+
+http://dump.fm/images/20100412/1271118841756-dumpfm-jertronic-idgisplode.gif
+
+ 
+
+http://dump.fm/images/20100412/1271119643882-dumpfm-ryder-Picture-384.png
+
+ 
+
+http://dump.fm/images/20100413/1271133664413-dumpfm-ryder-Picture-397.png
+
+ 
+
+http://dump.fm/images/1267044843246-lady.gif
+
+ 
+
+http://dump.fm/images/1267043111981-Picture-2.png
+
+ 
+
+http://dump.fm/images/20100413/1271193181035-dumpfm-jeanette-Picture-1047.png
+
+ 
+
+http://dump.fm/images/20100413/1271193218714-dumpfm-ryder-sniffycatguymason.gif
+
+ 
+
+http://27.media.tumblr.com/tumblr_l0u6lcGdgc1qzfpk4o1_500.gif
+
+ 
+
+http://dump.fm/images/20100413/1271195890446-dumpfm-mat3i-HIM.gif
+
+ 
+
+http://dump.fm/images/20100415/1271321054370-dumpfm-foot-Picture-53.png
+
+ 
+
+http://dump.fm/images/20100413/1271195996111-dumpfm-frankhats-dontgethead.jpg
+
+ 
+
+http://dump.fm/images/20100415/1271389483032-dumpfm-shaq-retard.jpg
+
+ 
+
+http://dump.fm/images/20100326/1269583520221-dumpfm-ryder-Picture-2081.png
+
+ 
+
+http://dump.fm/images/20100416/1271399363348-dumpfm-frankhats-dontfriends.jpg
+
+ 
+
+http://dump.fm/images/20100417/1271489503232-dumpfm-frankhats-dontgetturdeating.gif
+
+ 
+
+http://dump.fm/images/20100401/1270177487240-dumpfm-ryder-guyfunny.png
+
+ 
+
+http://dump.fm/images/20100417/1271497185798-dumpfm-foot-ykW0S.jpg
+
+ 
+
+http://dump.fm/images/20100417/1271497299338-dumpfm-frankhats-getbag.jpg
+
+ 
+
+http://dump.fm/images/20100405/1270451213193-dumpfm-ryder-Picture-187.png
+
+ 
+
+http://dump.fm/images/20100405/1270448791853-dumpfm-ryder-Picture-169.png
+
+ 
+
+http://dump.fm/images/20100403/1270290052415-dumpfm-ryder-Picture-148.png
+
+ 
+
+http://dump.fm/images/20100402/1270261868168-dumpfm-foot-idk.jpg
+
+ 
+
+http://dump.fm/images/20100405/1270451552583-dumpfm-ryder-guybreadhover.gif
+
+ 
+
+http://dump.fm/images/20100417/1271562875087-dumpfm-jertronic-cry-until-get-it.gif
+
+ 
+
+http://dump.fm/images/20100418/1271579861201-dumpfm-foot-1271579304078-dumpfm-ryder-Picture-516-1.png
+
+ 
+
+http://dump.fm/images/20100418/1271579977086-dumpfm-ryder-Picture-521.png
+
+ 
+
+http://dump.fm/images/20100418/1271580228382-dumpfm-ryder-Picture-523.png
+
+ 
+
+http://dump.fm/images/20100418/1271581669282-dumpfm-ryder-Picture-525.png
+
+ 
+
+http://dump.fm/images/20100418/1271584909042-dumpfm-frankhats-hiding.jpg
+
+ 
+
+http://dump.fm/images/20100418/1271579100256-dumpfm-pheezer-idontgetitfuckyou.gif
+
+ 
+
+http://dump.fm/images/20100418/1271646064613-dumpfm-frankhats-getjobs.gif
+
+ 
+
+http://dump.fm/images/20100418/1271582779905-dumpfm-frankhats-dontlook.gif
+
+ 
+
+http://dump.fm/images/20100418/1271637365874-dumpfm-ryder-Picture-546.png
+
+ 
+
+http://dump.fm/images/20100418/1271637177773-dumpfm-ryder-Picture-545.png
+
+ 
+
+http://dump.fm/images/20100418/1271628385535-dumpfm-ryder-Picture-543.png
+
+ 
+
+http://dump.fm/images/20100419/1271654870347-dumpfm-foot-Picture-44.png
+
+ 
+
+http://dump.fm/images/20100418/1271618348378-dumpfm-johntransue-1271581782422-dumpfm-foot-Picture-81.gif
+
+ 
+
+http://dump.fm/images/20100419/1271663567628-dumpfm-frankhats-bikeleader.jpg
+
+ 
+
+http://dump.fm/images/20100418/1271584609909-dumpfm-ryder-Picture-532.png
+
+ 
+
+http://dump.fm/images/20100419/1271664504149-dumpfm-foot-24044_1382683481693_1070133119_1141455_4968953_n.jpg
+
+ 
+
+http://dump.fm/images/20100419/1271664900678-dumpfm-foot-1271664772627-dumpfm-jeanette-Picture-524.png
+
+ 
+
+http://dump.fm/images/20100419/1271665856679-dumpfm-jeanette-Picture-1203.png
+
+ 
+
+http://dump.fm/images/20100324/1269407028795-dumpfm-frankhats-duntv.jpg
+
+ 
+
+http://dump.fm/images/20100323/1269334306336-dumpfm-ryder-Picture-2031.png
+
+ 
+
+http://dump.fm/images/20100322/1269243170176-dumpfm-ryder-Picture-1992.png
+
+ 
+
+http://dump.fm/images/1266884561915-Screen-shot-2010-02-22-at-7.22.13-PM.png
+
+ 
+
+http://dump.fm/images/1266866394012-Picture-1245.png
+
+ 
+
+http://dump.fm/images/20100321/1269211476225-dumpfm-jeanette-Picture-590.png
+
+ 
+
+http://dump.fm/images/1266904219513-Picture-1288.png
+
+ 
+
+http://dump.fm/images/1266205200000-Picture-887.png
+
+ 
+
+http://dump.fm/images/20100321/1269206238486-dumpfm-jeanette-Picture-587.png
+
+ 
+
+http://i49.tinypic.com/2v8s903.jpg
+
+ 
+
+http://dump.fm/images/20100319/1269032046474-dumpfm-frankhats-cleangetit.png
+
+ 
+
+http://dump.fm/images/20100320/1269058791399-dumpfm-ryder-idontgetitmoot.png
+
+ 
+
+http://dump.fm/images/1266701700856-Picture-4.png
+
+ 
+
+http://dump.fm/images/1266701093659-Picture-1.png
+
+ 
+
+http://dump.fm/images/1266097216406-1266097108677-notgoingtohappen.gif
+
+ 
+
+http://dump.fm/images/1266097476626-1266097108677-notgoingtohappen.jpg
+
+ 
+
+http://dump.fm/images/1266101477066-gallerie.jpg
+
+ 
+
+http://dump.fm/images/1266102511308-idgi.gif
+
+ 
+
+http://74.50.124.202/image/1aVMK-10j-1.gif?height=400&scale=max&width=400
+
+ 
+
+http://dump.fm/images/1266190920179-90_w9YlTyhv6V8Qh6Q0G4g.jpg
+
+ 
+
+http://dump.fm/images/1266191384380-5fb6SywRT029KqZqTe0NNg.jpg
+
+ 
+
+http://dump.fm/images/1266191673437-FIrq-Tou6Eg_8zrFAmjV8w.jpg
+
+ 
+
+http://dump.fm/images/1266192442019-LebbaStMljMGyP7gESyGrA.jpg
+
+ 
+
+http://dump.fm/images/1266193548181-Zlyjt4zgqj9E3UV-S-iK1Q.jpg
+
+ 
+
+http://74.50.124.202/image/1aVMK-10t-1.jpg?height=640&scale=max&width=640
+
+ 
+
+http://74.50.124.202/image/1aVMK-10u-1.jpg?height=640&scale=max&width=640
+
+ 
+
+http://dump.fm/images/1266234113086-1266190462995_ff567.jpg
+
+ 
+
+http://dump.fm/images/1267361752501-Screen-shot-2010-02-21-at-3.58.28-AM.png
+
+ 
+
+http://dump.fm/images/1268281646619-Screen-shot-2010-03-10-at-8.26.41-PM.png
+
+ 
+
+http://dump.fm/images/20100312/1268384300040-dumpfm-timb-jertronic.morph.gif
+
+ 
+
+http://dump.fm/images/20100312/1268387819860-dumpfm-timb-ryder.upsidedown.morph.gif
+
+ 
+
+http://dump.fm/images/20100319/1268990790344-dumpfm-frankhats-dumphone.gif
+
+ 
+
+http://dump.fm/images/1268284173872-Screen-shot-2010-03-10-at-9.07.49-PM.png
+
+ 
+
+http://dump.fm/images/1268260418722-notgoingtohappen.gif
+
+ 
+
+http://dump.fm/images/1268262004981-Picture-353.png
+
+ 
+
+http://dump.fm/images/1266361889102-Picture-2.png
+
+ 
+
+http://dump.fm/images/1266273927836-whenwilligetit.gif
+
+ 
+
+http://dump.fm/images/1268096149665-jnetdontgetit.gif
+
+ 
+
+http://27.media.tumblr.com/tumblr_kyzzjc8nMv1qz8opmo1_250.gif
+
+ 
+
+http://dump.fm/images/20100319/1268990254325-dumpfm-ryder-Picture-1933.png
+
+ 
+
+http://dump.fm/images/1267589980822-1266182446764-dumo.jpeg
+
+ 
+
+http://dump.fm/images/1266727251964-dump.fm.webcam.test.jpg
+
+ 
+
+http://dump.fm/images/1268160453226-Picture-5.png
+
+ 
+
+http://dump.fm/images/1266195597779-dontgetHDA.gif
+
+ 
+
+http://dump.fm/images/1266196112086-dont.gif
+
+ 
+
+http://dump.fm/images/1267760115236-dont.png
+
+ 
+
+http://dump.fm/images/1267778681746-Picture-223.png
+
+ 
+
+http://dump.fm/images/20100311/1268344117021-dumpfm-timb-j.morph.gif
+
+ 
+
+http://dump.fm/images/20100319/1268989639997-dumpfm-ryder-Picture-1930.png
+
+ 
+
+http://dump.fm/images/20100319/1268989484800-dumpfm-jeanette-Picture-538.png
+
+ 
+
+http://dump.fm/images/20100319/1268989172037-dumpfm-mwellsie-guy.gif
+
+ 
+
+http://dump.fm/images/20100319/1268988777710-dumpfm-ryder-FINALLYIGETIT.jpg
+
+ 
+
+http://dump.fm/images/20100319/1268988131400-dumpfm-frankhats-dunmom.jpg
+
+ 
+
+http://dump.fm/images/20100318/1268894764628-dumpfm-frankhats-Untitled-3.png
+
+ 
+
+http://dump.fm/images/1266825851804-Picture-1233.png
+
+ 
+
+http://24.media.tumblr.com/tumblr_kzf826nMy61qz8opmo1_500.png
+
+ 
+
+http://dump.fm/images/20100317/1268813694153-dumpfm-ryder-gatesdump.jpg
+
+ 
+
+http://dump.fm/images/1267294242665-JNETPIZZA.gif
+
+ 
+
+http://dump.fm/images/1266448158853-idontgetitbot.png
+
+ 
+
+http://dump.fm/images/1267588831314-Picture-1508.png
+
+ 
+
+http://dump.fm/images/1267320714013-Picture-1443.png
+
+ 
+
+http://dump.fm/images/1267300344083-idontgetit.jpg
+
+ 
+
+http://dump.fm/images/1267232179345-idontgetiteyez.gif
+
+ 
+
+http://dump.fm/images/1267422032393-Picture-1480.png
+
+ 
+
+http://dump.fm/images/1266604231028-IFONLYIGOTIT2.png
+
+ 
+
+http://dump.fm/images/1267589971256-Picture-103.png
+
+ 
+
+http://dump.fm/images/1267591430660-idontgetitvamp.gif
+
+ 
+
+http://dump.fm/images/1267668839821-idgimouth.gif
+
+ 
+
+http://dump.fm/images/1267668923792-Picture-7.gif
+
+ 
+
+http://dump.fm/images/1267704329936-Picture-195.png
+
+ 
+
+http://dump.fm/images/1266455113960-Picture-3.png
+
+ 
+
+http://dump.fm/images/1266362179381-Picture-3.png
+
+ 
+
+http://i46.tinypic.com/9v9wn7.jpg
+
+ 
+
+http://dump.fm/images/1266273918102-IDGI.gif
+
+ 
+
+http://dump.fm/images/1266318507160-guycurtains.gif
+
+ 
+
+http://dump.fm/images/1266361564489-Picture-105.png
+
+ 
+
+http://dump.fm/images/1266377477267-Picture-6.png
+
+ 
+
+http://dump.fm/images/1266356768474-Picture-984.png
+
+ 
+
+http://dump.fm/images/1266446803730-1266314492419-getitandsucks.gif
+
+ 
+
+http://dump.fm/images/1266532563132-1266532524431-idontgetitparty.jpg
+
+ 
+
+http://i49.tinypic.com/2v8s903.jpg
+
+ 
+
+http://dump.fm/images/1266453562966-guywithhisdog.png
+
+ 
+
+http://dump.fm/images/1266177701532-idontgetitfacefat.gif
+
+ 
+
+http://dump.fm/images/1266871960976-idgi.jpg
+
+ 
+
+http://dump.fm/images/1266726702281-Picture-1193.png
+
+ 
+
+http://dump.fm/images/1267232593224-1266189511462-Picture-880.png
+
+ 
+
+http://dump.fm/images/1267259317284-Picture-30.png
+
+ 
+
+http://dump.fm/images/1266315286811-Picture-953.png
+
+ 
+
+http://dump.fm/images/1266320375222-Picture-954.png
+
+ 
+
+iStockphoto content can be seen in attachment titled “pcwphotodeactivated.pdf”.
+
+ 
+
+All content licensed from iStockphoto must be used in accordance of the Content License Agreement (http://www. istockphoto.com/license.php the “Agreement”), as per section 4(a): you may not: use the Content in a fashion that is considered by iStockphoto (acting reasonably) as or under applicable law is considered pornographic, obscene, immoral, infringing, defamatory or libelous in nature, or that would be reasonably likely to bring any person or property reflected in the Content into disrepute.
+
+ 
+
+As a good faith belief is held that my rights have been infringed, I  require that you immediately remove the unauthorized works from your  site.
+
+ 
+
+Under penalty of perjury I state that the above information is  accurate, and that I am the copyright holder to the works in mention.
+
+ 
+
+As your usage falls outside the Agreement terms, please take this as your official Cease and Desist notice. We require that the infringing imagery be removed from the Website immediately, as well as all other materials.
+
+ 
+
+A response to this notice is required no later than 5 business days from today’s date to confirm your compliance.
+
+ 
+
+Regards,
+
+ 
+
+Veronica Langridge
+
+Compliance Enforcement Officer
+_________________________
+iStockphoto LP
+Suite 200 – 1240 20th Avenue SE
+Calgary, AB  T2G 1M8, Canada
+
+t: 1-866-478-6251 ext. 6839
+e: ce@istockphoto.com
+\ No newline at end of file
diff --git a/template/about_us.st b/template/about_us.st
index 79586ab..b860cf4 100644
--- a/template/about_us.st
+++ b/template/about_us.st
@@ -42,7 +42,7 @@ DUMP.FM is a <img src="/static/img/newanim.gif"> exciting tool for the internets
     <div style="display:none;"id="link">
 	<div id="content" name="content"style="background-image:url(/static/img/hearts.gif);background-repeat:repeat;"> 
 <img src="/static/img/dumpteam.gif"><br><br>
-<h1><br>
+<div id="abouttxt"><h1><br>
 <a href="/u/ryder">Ryder Ripps</a> - screams, rapping<br></h1>
     <h2>  <img src="/static/img/dot.gif"> Ryder is also the founder of <a href="http://www.internetarchaeology.org" target="_blank">Internet Archaeology</a></h2>
   <h1><a href="/u/scottbot">Scott Ostler</a> - clean vocals <br></h1>
@@ -54,8 +54,10 @@ DUMP.FM is a <img src="/static/img/newanim.gif"> exciting tool for the internets
 </h1>
 
         <div id="byfurie"><a href="http://www.mattfurie.com/"target="_blank"><img src="/static/img/bymattfurie.png"></a></div>
+   </div> </div>
     </div>
-    </div>
+    
+    
     <div style="display:none;background-color:#fff;"id="contact">
 	<div id="content" name="content"> 
 
diff --git a/template/mail/html.st b/template/mail/html.st
index 33d4c1e..44babbb 100644
--- a/template/mail/html.st
+++ b/template/mail/html.st
@@ -1,27 +1,129 @@
 SUBJECT: Hey $nick$, Welcome to dump.fm!
 <html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-</head>
 
-<body style="font-family: Helvetica,Arial,Sans-Serif; font-size: 
-36px;" leftmargin="0" topmargin="0" link="#6996b2" vlink="#6996b2" 
-alink="#6996b2" bgcolor="#eef2ff" marginheight="0" marginwidth="0" 
-text="#ffffff">
-<center>
-  <p>&nbsp;</p>
-  <table width="625" height="359" border="50" bordercolor="#0072f9">
-    <tr>
-      <td width="517" height="53" background="http://dump.fm/static/img/dblue2.png" bgcolor="#0072f9"><font size="+7"><center><strong>dump.fm</strong></center></font></td>
-    </tr>
-    <tr>
-      <td><img src="http://dump.fm/static/mail/welcome.gif" /><img src="http://dump.fm/static/mail/welcome3.gif" /><img src="http://dump.fm/static/mail/welcome.gif" />&nbsp;</td>
-    </tr>
-    <tr>
-      <td><font color="#666666"><center>Welcome to dump.fm $nick$!</center></font></td>
-    </tr>
-  </table>
-</center>
+<table width="100%" cellspacing="10" cellpadding="0">
+   <tr>
+      <td align="center" valign="top">
+         
+         <table width="580" border="0" cellspacing="0" cellpadding="0" class="main">
+            <tr>
+               <td align="center" class="permission">
+                  <p>You're receiving this newsletter because you bought widgets from us.</p>
+                  <p>Having trouble reading this email? <webversion>View it on your browser</webversion>. Not interested anymore? <unsubscribe>Unsubscribe Instantly</unsubscribe>.</p>
+               </td>
+            </tr>
+            <tr>
+               <td height="90" valign="bottom" align="left" class="header">
+                  <img src="header.gif" width="580" height="90" alt="ABC Widgets" />
+               </td>
+            </tr>
+            <tr>
+               <td align="center">
+                  
+                  <table width="550" cellspacing="0" cellpadding="0">
+                     <tr>
+                        <td width="192"></td>
+                        <td></td>
+                        <td class="date"><p><$currentdayname$> <$currentday$> <$currentmonthname$></p></td>
+                     </tr>
+                     <tr align="left" rowspan="3" valign="top">
+                        
+                        <td width="192" valign="top" class="sidebar" align="left">
+
+                           <table width="100%" cellspacing="0" cellpadding="4" bgcolor="#eeeeee">
+                              <tr>
+                                 <td bgcolor="#000000" class="sideHeader">
+                                    <h3>In this issue</h3>
+                                 </td>
+                              </tr>
+                              <tr>
+                                 <td>
+                                    <ul>
+                                       <tableofcontents>
+                                         <li><$repeatertitle$></li>
+                                       </tableofcontents>
+                                    </ul>
+                                 </td>
+                              </tr>
+                           </table>
+                           
+                           <img src="smallspacer.gif" width="192" height="25" />
+
+                           <table width="100%" cellspacing="0" cellpadding="4" bgcolor="#000000">
+                              <tr>
+                                 <td class="sideTitle">
+                                    <h3>In other news</h3>
+                                 </td>
+                              </tr>
+                           </table>
+                        
+                           <repeater>
+                              <h4><$title link='true' default='Enter your title'$></h4>
+                              <$description default='<p>Enter your description</p>'$>
+                              <img src="smallhr.gif" width="190" height="19" />
+                           </repeater>
+
+                           <img src="smallspacer.gif" width="192" height="25" />
+
+                           <table width="100%" cellspacing="0" cellpadding="4" bgcolor="#000000">
+                              <tr>
+                                 <td class="sideTitle">
+                                    <h3>Forward to a friend</h3>
+                                 </td>
+                              </tr>
+                           </table>
+                           <p>Know someone who might be interested in the email? Why not <forwardtoafriend>forward this email</forwardtoafriend> to them.</p>
+
+                           <img src="smallhr.gif" width="190" height="19" />
+
+                           <img src="smallspacer.gif" width="192" height="25" />
+
+                           <table width="100%" cellspacing="0" cellpadding="4" bgcolor="#000000">
+                              <tr>
+                                 <td class="sideTitle">
+                                    <h3>Unsubscribe</h3>
+                                 </td>
+                              </tr>
+                           </table>
+                           <p>Don't want to receive these emails any more. Please <unsubscribe>unsubscribe instantly</unsubscribe>.</p>
+
+                           <img src="smallhr.gif" width="190" height="19" />
+                        </td>
+
+                        <td width="28"></td>
+
+                        <td width="330" valign="top" class="mainbar" align="left">
+                           
+                           <repeater toc='true'>
+                              <table cellspacing="0" cellpadding="4" bgcolor="#000000">
+                                 <tr>
+                                    <td>
+                                       <h2><$title link='true' default='Enter your title'$></h2>
+                                    </td>
+                                 </tr>
+                              </table>
+                              <p><img src="<$imagesrc link='true'$>" alt="Alt" width="329" height="164" /></p>
+                              <$description default='<p>Enter your description</p>'$>
+                              <img src="hr.gif" width="329" height="27" />
+                           </repeater>
+                           
+                        </td>
+                     </tr>
+                  </table>
+                  
+               </td>
+            </tr>
+            <tr>
+               <td align="center" class="footer">
+                  <p>abcWidgets and the abcWidgets Logo are registered trademarks of <span style="font-weight: bold;">abcWidgets Corp</span>.</p>
+                  <p>ABCWidgets Corp &#151; 123 Some Street, City, ST 99999. Ph +1 4 1477 89 745</p>
+               </td>
+            </tr>
+         </table>
+
+      </td>
+   </tr>
+</table>
+
 
-</body>
 </html>
diff --git a/template/mail/reset.st b/template/mail/reset.st
index 8112f90..57cec78 100644
--- a/template/mail/reset.st
+++ b/template/mail/reset.st
@@ -1,6 +1,35 @@
 SUBJECT: dump.fm Password Reset
-
-We're sorry you don't have your password, $nick$. Every moment
+<html>
+<body style="background-color:#EEF2FF;padding-left:60px;padding-right:60px;padding-top:35px;padding-bottom:35px;-moz-border-radius:15px;border-radius:15px;-webkit-border-radius:15px;">
+<div style="padding:15px;
+border:1px dashed #cccccc;width:460px;background-color:white;">
+<strong><pre>
+  __                                    ___               
+ /\ \                                 /'___\              
+ \_\ \  __  __    ___ ___   _____    /\ \__/   ___ ___    
+ / _  \/\ \/\ \ /' __` __`\/\ '__`\  \ \ ,__\/' __` __`\  
+/\ \_\ \ \ \_\ \/\ \/\ \/\ \ \ \_\ \__\ \ \_//\ \/\ \/\ \ 
+\ \___,_\ \____/\ \_\ \_\ \_\ \ ,__/\_\\\ \_\ \ \_\ \_\ \_\
+ \/__,_ /\/___/  \/_/\/_/\/_/\ \ \/\/_/ \/_/  \/_/\/_/\/_/
+                              \ \_\                       
+                               \/_/              
+</pre></strong>
+<hr width="70%"align="left">
+<p style="width:380px;"><b>
+ Hi $nick$, we're sorry you've misplaced your password. Every moment
 you're not dumping is a dagger in our hearts.
+<br><br>
+<a href="$link$">Click here</a> to get back into the game!
+<br><br>
+Happy dumping!
+<br><br>
+-Ryder, Scott, Tim & Stefan</p></b>
+
 
-Click <$link$> to get back into the game!
+<p style="font-family:verdana,arial,sans-serif;font-size:10px;">
+@2010 <a href="http://dump.fm/">dump.fm</a>
+<a href="http://dump.fm/about_us"><span style="word-spacing:normal;">About Us</span></a> 
+<a href="http://dump.fm/help"><span style="word-spacing:normal;">Help FAQ</span></a> 
+<a href="http://dump.fm/terms">Terms</a>
+<a href="http://dump.fm/privacy">Privacy</a></div></p><br><br></div></body>
+</html>
diff --git a/template/mail/welcome.st b/template/mail/welcome.st
index 7e8e9ef..c708ef4 100644
--- a/template/mail/welcome.st
+++ b/template/mail/welcome.st
@@ -1,7 +1,32 @@
 SUBJECT: Welcome to dump.fm, $nick$!
 <html>
-<img src="http://dump.fm/static/mail/welcome.gif">
-Welcome to the dump.fm posting experience.
-Get started at <http://dump.fm/chat>, or setup your
-profile at <http://dump.fm/u/$nick$>!
-</html>
-\ No newline at end of file
+<body style="background-color:#EEF2FF;padding-left:60px;padding-right:60px;padding-top:35px;padding-bottom:35px;-moz-border-radius:15px;border-radius:15px;-webkit-border-radius:15px;">
+<div style="padding:15px;
+border:1px dashed #cccccc;width:460px;background-color:white;">
+<strong><pre>
+  __                                    ___               
+ /\ \                                 /'___\              
+ \_\ \  __  __    ___ ___   _____    /\ \__/   ___ ___    
+ / _  \/\ \/\ \ /' __` __`\/\ '__`\  \ \ ,__\/' __` __`\  
+/\ \_\ \ \ \_\ \/\ \/\ \/\ \ \ \_\ \__\ \ \_//\ \/\ \/\ \ 
+\ \___,_\ \____/\ \_\ \_\ \_\ \ ,__/\_\\\ \_\ \ \_\ \_\ \_\
+ \/__,_ /\/___/  \/_/\/_/\/_/\ \ \/\/_/ \/_/  \/_/\/_/\/_/
+                              \ \_\                       
+                               \/_/              
+</pre></strong>
+<hr width="70%"align="left">
+<p style="width:380px;"><b>
+ DUMP.FM IS A REAL TIME IMAGE BASED MESSAGE BOARD! Post pics from your webcam, your computer or anywhere on the web instantly with other awesome people! Get started by setting up your profile <a href="http://dump.fm/u/$nick$">here</a>! 
+<br><br>
+Happy dumping!
+<br><br>
+-Ryder, Scott, Tim & Stefan</p></b>
+
+
+<p style="font-family:verdana,arial,sans-serif;font-size:10px;">
+@2010 <a href="http://dump.fm/">dump.fm</a>
+<a href="http://dump.fm/about_us"><span style="word-spacing:normal;">About Us</span></a> 
+<a href="http://dump.fm/help"><span style="word-spacing:normal;">Help FAQ</span></a> 
+<a href="http://dump.fm/terms">Terms</a>
+<a href="http://dump.fm/privacy">Privacy</a></div></p><br><br></div></body>
+</html>